diff options
| author | Justin Mayer <entroP@gmail.com> | 2013-04-27 19:13:38 -0700 |
|---|---|---|
| committer | Justin Mayer <entroP@gmail.com> | 2013-04-27 19:13:38 -0700 |
| commit | d00947c9817c66973630c93f948db84f06f687d7 (patch) | |
| tree | 96bdf275508456e77cf14f8d88ea2d45e49a4646 /.gitmodules | |
| parent | 323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0 (diff) | |
| download | pelican-themes-d00947c9817c66973630c93f948db84f06f687d7.tar.gz | |
Remove errant line left over from merge conflict
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 1 insertions, 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 |