병합

assets/scss/style.scss

@@ -886,7 +886,6 @@ img{
         gap: 10px;
         margin-bottom: 140px;
         position: relative;
-<<<<<<< HEAD
         .number{
           position: relative;
           display: inline-block;
@@ -916,11 +915,6 @@ img{
           left: -300px;
           top: calc(50% - 500px);
           height: 1000px;
-=======
-
-
-        .bbl--eft01{
->>>>>>> 68e94517d6f897c8fa42310a36d0bfaf2639941f
           position: absolute;
           top:50%;
           transform: translateY(-50%);
@@ -941,8 +935,6 @@ img{
           background: url(../img/bbl_02.png) no-repeat center;
           animation: shakeX 0.8s cubic-bezier(0.36, 0.07, 0.19, 0.97) infinite;
         }
-<<<<<<< HEAD
-=======
 
         .bbl--eft03{
           position: absolute;
@@ -1053,7 +1045,6 @@ img{
             }
           }
         }
->>>>>>> 68e94517d6f897c8fa42310a36d0bfaf2639941f
       }
       .evt--btn{
         border-style: solid;

index.html

@@ -239,7 +239,6 @@
           <p>10시에 만나요 !</p>
         </div>
         <div class="count--num">
-<<<<<<< HEAD
           <span class="number" data-number="0">
             <span class="primary">
             </span>
@@ -282,17 +281,12 @@
             <span class="secondary">
             </span>
           </span>
-=======
           <div class="bbl--eft03"></div>
           <div class="bbl--eft02"></div>
           <div class="bbl--eft01"></div>
-          <div class="hours"><span>0</span><span>1</span></div>
-          <div class="minutes"><span>0</span><span>0</span></div>
-          <div class="seconds"><span>0</span><span>0</span></div>
           <div class="bbl--eft06"></div>
           <div class="bbl--eft05"></div>
           <div class="bbl--eft04"></div>
->>>>>>> 68e94517d6f897c8fa42310a36d0bfaf2639941f
         </div>
         <a href="#" class="evt--btn">얼리버드 티켓 구매</a>
       </div>