Permalink
Browse files

Merge pull request #3 from ironshellstudios/master

JPA conflict with Play 1.2.4 and swagger-play
  • Loading branch information...
2 parents d2abecd + fa16979 commit a3b0dfc70e0d6fffe3c8771f680b13f9e9f7db85 @ayush ayush committed Mar 16, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 conf/dependencies.yml
View
@@ -6,6 +6,7 @@ require:
exclude:
- org.slf4j -> *
- org.jboss.weld -> *
+ - javax.persistence -> *
repositories:
- sonatype:

0 comments on commit a3b0dfc

Please sign in to comment.