merge conflicts fixed

kowenzhang · Aug 9, 2014 · 45bf614 · 45bf614
2 parents b569a13 + 668333a
commit 45bf614
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/cat.html b/cat.html
@@ -1,2 +1,3 @@
 this is a html file
 a new line
+line of cat branch