conflict fixed 2

ayorfree · Feb 24, 2017 · ff627ca · ff627ca
2 parents 8487e63 + 3ffc005
commit ff627ca
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ape.txt b/ape.txt
@@ -10,4 +10,4 @@ toattoed man.
 
 cold cell.
 
-no comment.
+pop.