diff options
| author | Justin Mayer <entroP@gmail.com> | 2013-04-26 19:28:29 -0700 |
|---|---|---|
| committer | Justin Mayer <entroP@gmail.com> | 2013-04-26 19:28:29 -0700 |
| commit | 323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0 (patch) | |
| tree | b22a655eb89d5fbfe989c5ec8eed43bcde33ea2f /.gitmodules | |
| parent | 7112483f5385f54672d22a76a221b914b193ddf4 (diff) | |
| parent | 23fc82116999a1bb83260e9a0355974984ce39b0 (diff) | |
| download | pelican-themes-323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0.zip pelican-themes-323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0.tar.gz pelican-themes-323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0.tar.bz2 | |
Merge pull request #79 from gregseth/master
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index c63feb6..fe8d3ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,6 +16,7 @@ [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 @@ -34,3 +35,6 @@ [submodule "whispers"] path = whispersTheme url = git://github.com/deBorn/whispersTheme.git +[submodule "bluegrasshopper"] + path = bluegrasshopper + url = git@github.com:gregseth/pelican-bgh.git |