tanmnt/production/ticket/123-2

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