Permalink
Browse files

merge conflicts

  • Loading branch information...
2 parents 26c0f54 + 9525b69 commit 20b46d693648fe0e9ee21df99f20c22a564a1b94 @Srirangan committed Oct 7, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 project/plugins.sbt
View
4 project/plugins.sbt
@@ -1,8 +1,8 @@
// Comment to get more information during initialization
logLevel := Level.Warn
-// The Typesafe repository
+// The Typesafe repository
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
// Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.1.5")
+addSbtPlugin("play" % "sbt-plugin" % "2.1.5")

0 comments on commit 20b46d6

Please sign in to comment.