diff --git a/homepage.html b/homepage.html index e1624ba..fc50794 100644 --- a/homepage.html +++ b/homepage.html @@ -21,7 +21,7 @@
-
+
-
+
diff --git a/product_list.html b/product_list.html index a911c07..9264b65 100644 --- a/product_list.html +++ b/product_list.html @@ -778,11 +778,6 @@
- -<<<<<<< HEAD - -======= ->>>>>>> tieptk
diff --git a/them_san_pham.html b/them_san_pham.html index e55c3d4..6ac29e6 100644 --- a/them_san_pham.html +++ b/them_san_pham.html @@ -759,10 +759,6 @@
-<<<<<<< HEAD -======= - ->>>>>>> tieptk