search

redacademy / rethink-spring-2019

http://rethink.van.cp.academy.red
0 stars 0 forks source link

Merge conflict in SCSS file #8

Open benorgan opened 5 years ago

benorgan commented 5 years ago

https://github.com/redacademy/rethink-spring-2019/blob/307420d5cbf582d8ec53264cf482a660768a4ccb/themes/rcforward/sass/_content.scss#L69-L96

You have a merge conflict here which hasn't been resolved and will be causing issues with your SASS compilation. This would happen when you do git pull, you should ensure you check the terminal output when you run this command as it will give you an error message if there is a merge conflict. These conflicts need to be resolved and the flags in the code removed before you do a git add

benorgan commented 5 years ago

You also have a conflict in _variables.scss