양윤지 / Open_Source_Project

Go to a project
Toggle navigation Toggle navigation pinning
김성준
8813903d 1 parent 4cfb9164

Merge

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
62 <strong> 62 <strong>
63 <%= "로테이션 챔피언: " %> 63 <%= "로테이션 챔피언: " %>
64 </strong> 64 </strong>
65 -<<<<<<< HEAD
66 <% for (var i=0; i<c_rotation.length-1; i++){ %> 65 <% for (var i=0; i<c_rotation.length-1; i++){ %>
67 <img src= <%=c_rotation[i]%> width=50, height=50> 66 <img src= <%=c_rotation[i]%> width=50, height=50>
68 <% } %> 67 <% } %>
...@@ -70,7 +69,6 @@ ...@@ -70,7 +69,6 @@
70 69
71 <br></br> 70 <br></br>
72 71
73 -=======
74 </div> 72 </div>
75 <div class="center"> 73 <div class="center">
76 <strong> 74 <strong>
...@@ -98,7 +96,6 @@ ...@@ -98,7 +96,6 @@
98 <%}%> 96 <%}%>
99 </strong> 97 </strong>
100 </div> 98 </div>
101 ->>>>>>> master
102 <% for (var i=0; i<c_id.length-1; i++){ %> 99 <% for (var i=0; i<c_id.length-1; i++){ %>
103 <div class="champImage"> 100 <div class="champImage">
104 <div class="center"> 101 <div class="center">
......