Skip to content

Commit

Permalink
conflict fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayorfree
ayorfree committed Feb 24, 2017
2 parents 57c6fcb + 3be6364 commit a2110b4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ape.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ going up.

triple sun

cold cell.
toattoed man.

0 comments on commit a2110b4

Please sign in to comment.