8/1/2024

2024-01-08 10:31:31 +07:00
parent c2e65f4cc7 0a4a6511bc
commit 795f392fab
2 changed files with 8 additions and 0 deletions
--- a/product_list.html
+++ b/product_list.html
@@ -777,8 +777,12 @@
            </div>

        </div>
+        <!-- end -->

+<<<<<<< HEAD

+=======
+>>>>>>> tieptk
    </div>
    <!-- Script -->
    <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>
--- a/them_san_pham.html
+++ b/them_san_pham.html
@@ -759,6 +759,10 @@
        </div>

    </div>
+<<<<<<< HEAD
+=======
+    <!-- end -->
+>>>>>>> tieptk

    <!-- Script -->
    <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>