Styling #44
Merged
Styling #44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mimilettd I resolved some conflicts that were not saved. These were conflicts that you resolved locally but that github did not save for whatever reason. Everything looks good and thanks for not only working so hard on this styling but for walking us through all of it! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#log
Description of Changes Made: There are a lot of things happening in this branch. First, I had to change some tests because some tests couldn't find the right button (due to the persistent nav bar). Furthermore, I added the session#destroy method so I could test the logout button (issue #20 / user story #11.
Anticipated Code Effects: There are definitely some conflicts in this branch.
(Would this merge affect any other piece of our code?)
Reviewer: @rickyamparo