From f5209ae30b822f3cabf505dafec67a1b93cc5527 Mon Sep 17 00:00:00 2001 From: Kura Date: Mon, 9 Jun 2014 18:44:28 +0100 Subject: Fixed merge conflicts --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) 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 + -- cgit