Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T3 magd elshebokshy 2.8 #227

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

T3 magd elshebokshy 2.8 #227

wants to merge 12 commits into from

Conversation

mshebokshy
Copy link
Collaborator

@mahmoudawadeen
Copy link
Collaborator

@mshebokshy resolve conflicts first

@mshebokshy
Copy link
Collaborator Author

@mahmoudawadeen conflict resolved

@mshebokshy
Copy link
Collaborator Author

@AmrEmara conflict resolved, please check

@AmrEmara
Copy link
Collaborator

@mshebokshy re-check indentation in members_controller.rb

end
end

end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the last 'end'

@mshebokshy
Copy link
Collaborator Author

@AmrEmara please recheck it

@mshebokshy
Copy link
Collaborator Author

@samehmetias @mahmoudawadeen please recheck it, conflicts resolved!

end
end

def recommended_items
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check indentation here

@mshebokshy
Copy link
Collaborator Author

@AmrEmara check again the code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants