Permalink
Browse files

Removing merge line that slipped in.

  • Loading branch information...
1 parent 3fbc84d commit 4992c958e2cb99d4587cb2b72d36ce260e5c869a @quidryan quidryan committed Apr 25, 2013
Showing with 0 additions and 1 deletion.
  1. +0 −1 .gitignore
View
@@ -49,7 +49,6 @@ Thumbs.db
# IntelliJ specific files/directories #
#######################################
->>>>>>> build/multi-project
out
.idea
*.ipr

0 comments on commit 4992c95

Please sign in to comment.