This commit is contained in:
2026-08-21 15:15:36 +08:00
parent d51f26e170
commit f9f068f517
7 changed files with 62 additions and 41 deletions
+2 -2
View File
@@ -168,7 +168,7 @@
<li data-site-guide-depth="3"><span class="sg-node sg-node--extra"><a href="../s20260612_04_jq_calculator.html">s20260612_04_jq_calculator.html(學校作業)</a></span></li>
<li data-site-guide-depth="3"><span class="sg-node sg-node--extra"><a href="../sechskies_brand_color_spec.html">sechskies_brand_color_spec.html(品牌色規範)</a></span></li>
<li data-site-guide-depth="3"><span class="sg-node sg-node--extra"><a href="../totoga2/readable_ebookcontent.html">totoga2/readable_ebookcontent.html(電子書內容草稿)</a></span></li>
<li data-site-guide-depth="3"><span class="sg-node sg-node--extra"><a href="../vedio/vedio-list.html">vedio/vedio-list.html深夜清單,追劇進度預覽頁)</a></span></li>
<li data-site-guide-depth="3"><span class="sg-node sg-node--extra"><a href="../vedio/vedio-list.html">vedio/vedio-list.html影片清單,追劇進度預覽頁)</a></span></li>
<li data-site-guide-depth="3"><span class="sg-node sg-node--extra" title="admin/api/back 等 PHP 後台,非靜態站主線">vedio/vedio-list/(追劇清單後台練習,非本站主線)</span></li>
</ul>
</li>
@@ -218,7 +218,7 @@
<tbody>
<tr>
<th scope="row">2026-07-30 分岔</th>
<td>本機原有 4 個未 push commit<code>variety/vedio-list.html</code> 深夜清單、<code>concert/captain-aura.html</code><code>yellow-note/practice-room.html</code> 等),同時遠端 origin/main 多了 1 個新 commit<code>calendar2026.html</code> 2026 行事曆頁+<code>admin/</code> 後台系統,改動 <code>assets/js/map.js</code><code>member/member.html</code></td>
<td>本機原有 4 個未 push commit<code>variety/vedio-list.html</code> 影片清單、<code>concert/captain-aura.html</code><code>yellow-note/practice-room.html</code> 等),同時遠端 origin/main 多了 1 個新 commit<code>calendar2026.html</code> 2026 行事曆頁+<code>admin/</code> 後台系統,改動 <code>assets/js/map.js</code><code>member/member.html</code></td>
</tr>
<tr>
<th scope="row">衝突檔案</th>