Permalink
Browse files

adding tasks and templates submodules

  • Loading branch information...
1 parent e4092ee commit 46f9019b7fdfc09e66cf06b6093c1988653ecd9e @wpivotto wpivotto committed Aug 23, 2011
Showing with 9 additions and 3 deletions.
  1. +7 −3 .gitmodules
  2. +1 −0 vraptor-tasks
  3. +1 −0 vraptor-templates
View
@@ -16,8 +16,6 @@
[submodule "vraptor-jasperreport"]
path = vraptor-jasperreport
url = git@github.com:wpivotto/vraptor-jasperreport.git
-<<<<<<< HEAD
-=======
[submodule "vraptor-extractor"]
path = vraptor-extractor
url = https://github.com/jrdalpra/br.com.caelum.vraptor.util.extractor.git
@@ -33,4 +31,10 @@
[submodule "vraptor-gson-plugin"]
path = vraptor-gson-plugin
url = git@github.com:acdesouza/vraptor-gson-plugin.git
->>>>>>> upstream/master
+
+[submodule "vraptor-templates"]
+ path = vraptor-templates
+ url = git@github.com:wpivotto/vraptor-templates.git
+[submodule "vraptor-tasks"]
+ path = vraptor-tasks
+ url = git@github.com:wpivotto/vraptor-tasks.git
Submodule vraptor-tasks added at 105393
Submodule vraptor-templates added at 852363

0 comments on commit 46f9019

Please sign in to comment.