From d00947c9817c66973630c93f948db84f06f687d7 Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sat, 27 Apr 2013 19:13:38 -0700 Subject: [PATCH] Remove errant line left over from merge conflict --- .gitmodules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index fe8d3ce..8078dca 100644 --- 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 @@ -28,7 +27,7 @@ url = git://github.com/jsliang/pelican-fresh [submodule "variant-note"] path = pelican-variant-note - url = git://github.com/mpancorbo/pelican-variant-note.git + url = git://github.com/mpancorbo/pelican-variant-note.git [submodule "water-iris"] path = water-iris url = git://github.com/jarv/water-iris