resolved merge conflicts

Author: SimJH

themes/mcns-theme/styles/theme.css

@@ -177,4 +177,4 @@
     -moz-transition: background 0.3s linear;
     -o-transition: background 0.3s linear;
     transition: background 0.3s linear;
-}
+}