#132912913 Fix conflict in head.jade #29
Open
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
Fix conflict in head.jade Fixes ##132912913
| link(rel='stylesheet', href='/css/chat.css') | ||
| link(rel='stylesheet', href='/css/modal.css') | ||
| link(rel='stylesheet', href='/css/modal.css') | ||
| ======= |
There was a problem hiding this comment.
I am curious to know who did this. Please hit me via Dm if you did. We all need to be very conscious and pay attention to details whilst rebasing, so as not to break approved code in the process.
@demiladebamgbose @andela-abisoye @bolorundurowb @andela-oolutola @aezumezu @cyrielo 👆
houndci-bot
reviewed
Oct 21, 2016
| @@ -1,4 +1,4 @@ | |||
| @import "variable"; | |||
| @import "variable.scss"; | |||
There was a problem hiding this comment.
Imported partial variable.scss should be written as variable
Fix issues raised by hound Fixes #132912913
ruqoyyasadiq
approved these changes
Oct 21, 2016
…github.com/andela/project-kinsan into chore/#132912913/fix-conflict-in-jade-file
Refactor to fix hound issues Fixes #132912913
|
wasn't this implemented in another branch? do we still need to merge this in @demiladebamgbose? |
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.
What does this PR do?
Fix conflict in jade file
Description of Task to be completed?
Remove conflicting code in jade.head file