aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorKura <kura@kura.io>2014-06-09 18:44:28 +0100
committerKura <kura@kura.io>2014-06-09 18:44:28 +0100
commitf5209ae30b822f3cabf505dafec67a1b93cc5527 (patch)
tree5fd2858216412429544aef1bf5b8f93bcff6a21c /.gitmodules
parent84dcf50b345102a327afd0a23750df5d8e27f7e8 (diff)
downloadpelican-themes-f5209ae30b822f3cabf505dafec67a1b93cc5527.tar.gz
Fixed merge conflicts
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 58a3076..cc262ff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "pelicanthemes-generator"]
+ path = pelicanthemes-generator
+ url = https://github.com/badele/pelicanthemes-generator
[submodule "Responsive-Pelican"]
path = Responsive-Pelican
url = git@github.com:ir193/Responsive-Pelican.git
@@ -121,3 +124,4 @@
[submodule "twenty-html5up"]
path = twenty-html5up
url = git@github.com:frankV/twenty-pelican-html5up.git
+