fix config

wipcamp · Jan 21, 2016 · a2889d7 · a2889d7
1 parent 9fd4a71
commit a2889d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/css/main.css b/css/main.css
@@ -182,7 +182,7 @@ p{
   left: 50% !important;
   width: 250px;
   margin: 0 auto;
-
+  opacity: 0;
 }
 
 .reg img{

diff --git a/index.html b/index.html
@@ -23,11 +23,7 @@
           <div class="logo camp_way"></div> 
           <div class="logo sponser"></div>
         </div>
-<<<<<<< HEAD
-
-=======
         <canvas id="spotlight"></canvas>
->>>>>>> a55301b0f03f61f695fe46c07701d6fad1628a07
         <div class="over-earth">
           <!-- <img class="logo spotlight" src="images/layout/flag.png" alt=""> -->
           <img src="images/layout/earth.png" alt="" class="earth">