sambuc/pelican-themes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove errant line left over from merge conflict

Browse Source
This commit is contained in:
Justin Mayer
2013-04-27 19:13:38 -07:00
parent 323bfbf384
commit d00947c981
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -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