10;46 8/1/2024

2024-01-08 10:46:14 +07:00
parent 795f392fab
commit d467ff0fe0
3 changed files with 2 additions and 11 deletions
--- a/product_list.html
+++ b/product_list.html
@@ -778,11 +778,6 @@

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