fix conflict when merge branch

laudaikinhdi · Oct 8, 2018 · d788af5 · d788af5
1 parent e6c5c75
commit d788af5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/category.php b/category.php
@@ -14,4 +14,7 @@
 echo "fix conflict tanmnt/production/ticket/123-2";
 
 
-// <!--END -  tanmnt - 113 - ADD -->
+// <!--END -  tanmnt - 113 - ADD -->
+echo "fix conflict tanmnt/production/ticket/123-1";
+
+// <!--END -  tanmnt - 113 - ADD -->2