Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removing merge line that slipped in.

  • Loading branch information...
commit 4992c958e2cb99d4587cb2b72d36ce260e5c869a 1 parent 3fbc84d
@quidryan quidryan authored
Showing with 0 additions and 1 deletion.
  1. +0 −1  .gitignore
View
1  .gitignore
@@ -49,7 +49,6 @@ Thumbs.db
# IntelliJ specific files/directories #
#######################################
->>>>>>> build/multi-project
out
.idea
*.ipr
Please sign in to comment.
Something went wrong with that request. Please try again.