Remove errant line left over from merge conflict

2013-04-27 19:13:38 -07:00
parent 323bfbf384
commit d00947c981
1 changed files with 1 additions and 2 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,7 +16,6 @@
 [submodule "pelican-mockingbird"]
 	path = pelican-mockingbird
 	url = git://github.com/wrl/pelican-mockingbird.git
-<<<<<<< HEAD
 [submodule "bold"]
 	path = bold
 	url = git://github.com/demianbrecht/pelican-bold.git