Skip to content

Commit

Permalink
1a - merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Igor Khodyrev authored and Igor Khodyrev committed Nov 13, 2015
1 parent 0d845d8 commit 8fa133f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion testfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
1a

0 comments on commit 8fa133f

Please sign in to comment.