jeter20131220 3 rokov pred
rodič
commit
6c3e35fea2
1 zmenil súbory, kde vykonal 0 pridanie a 4 odobranie
  1. 0 4
      index.html

+ 0 - 4
index.html

@@ -3307,7 +3307,6 @@
                         <th scope="col">Last 7 Days</th>
                     </tr>
                 </thead>
-<<<<<<< HEAD
                 <tbody>
                     <tr>
                         <th scope="row">1</th>
@@ -3359,9 +3358,6 @@
                     </tr>
 
                 </tbody>
-=======
-                <tbody id="pc"></tbody>
->>>>>>> f0b3a782a99e534a20dc4cc90fd25109a1ad1792
             </table>
             <div class="sec07-table-button">
                 <button class="showdata data-button">完整數據</button>