merged style.scss

Author: sushilshinde

src/shared/components/TopcoderFooter/style.scss

@@ -4,12 +4,16 @@
   text-align: center;
   font-family: "Roboto", Helvetica, Arial, sans-serif;
   font-size: 12px;
+<<<<<<< HEAD
 <<<<<<< HEAD
   color: $tc-gray-60;
   color: $tc-gray-40;
 =======
   color: $tc-gray-30;
 >>>>>>> a5244bf6c... Merge pull request #2918 from r0hit-gupta/msft-29
+=======
+  color: $tc-gray-30;
+>>>>>>> a5244bf6c... Merge pull request #2918 from r0hit-gupta/msft-29
 }
 
 .footer {