Closed deveshd2k closed 6 years ago
You need to do a rebase. The conflicts will go away. And also the code style is not good in base.css.
Duplicate of https://github.com/pclubuiet/website/pull/104 so closing this one. Please don't resend PRs for same issues repeatedly like this and try to fix your issues.
You need to do a rebase. The conflicts will go away. And also the code style is not good in base.css.