diff options
author | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
---|---|---|
committer | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
commit | 98f0d46f2bbddf86e8d202b533af35fa79da2d2f (patch) | |
tree | 297d677cfa76bb20d4e80803343c69b99c939e37 /.gitmodules | |
parent | 2950b6abdad62fdd74682880acdec32f9b417420 (diff) | |
parent | 83892b7112e27721218556c4030cdd5c8d26f98b (diff) | |
download | pelican-themes-98f0d46f2bbddf86e8d202b533af35fa79da2d2f.tar.gz |
[dev-random] resolved conflicts
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..39dca1b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "svbtle"] + path = svbtle + url = https://github.com/wting/pelican-svbtle.git +[submodule "chunk"] + path = chunk + url = git@github.com:tbunnyman/pelican-chunk.git |