Merge pull request #79 from gregseth/master

2013-04-26 19:28:29 -07:00
parent 7112483f53 23fc821169
commit 323bfbf384
4 changed files with 6 additions and 0 deletions
--- 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