merged style.scss

sushilshinde · sushilshinde · commit 79567e02b551 · 2019-07-28T21:09:30.000+05:30
diff --git a/src/shared/components/TopcoderFooter/style.scss b/src/shared/components/TopcoderFooter/style.scss
@@ -4,8 +4,12 @@
   text-align: center;
   font-family: "Roboto", Helvetica, Arial, sans-serif;
   font-size: 12px;
+<<<<<<< HEAD
   color: $tc-gray-60;
   color: $tc-gray-40;
+=======
+  color: $tc-gray-30;
+>>>>>>> a5244bf6c... Merge pull request #2918 from r0hit-gupta/msft-29
 }
 
 .footer {
