Skip to content

Commit

Permalink
Removed merge conflict text
Browse files Browse the repository at this point in the history
  • Loading branch information
Harrison committed Jan 9, 2015
1 parent e7842d8 commit b3105f2
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ Feddie

Harrison Shoebridge (@paked)
Jack Reichelt (jackreichelt)
<<<<<<< HEAD
Benjamin Jelavic
=======
David (@auscompgeek)
>>>>>>> origin/master
Rob Pike


Expand Down

0 comments on commit b3105f2

Please sign in to comment.