Skip to content
Browse files

finish merging pull request #37

  • Loading branch information...
1 parent 1df4749 commit 4e663327e75d15cd67a7d3b5e961d8fb6b0d61bd @mandubian mandubian committed Jan 17, 2012
Showing with 0 additions and 5 deletions.
  1. +0 −5 README
View
5 README
@@ -1,8 +1,3 @@
Play! framework plugin that allows for the deployment of any Play! application to Google App Engine.
-<<<<<<< HEAD
-**tested with :**
-* Play 1.2.4 and Google App Engine SDK for Java5/6
-=======
More information on: http://www.playframework.org/modules/gae
->>>>>>> c77911894a63cd2bbfb7e8f7e77d2dcecebbe375

0 comments on commit 4e66332

Please sign in to comment.
Something went wrong with that request. Please try again.