Permalink
Browse files

Merge branch 'master' into develop

Conflicts:
	src/main/g8/build.sbt
  • Loading branch information...
2 parents 85ab4e7 + e108243 commit b389e8d5f08266feec1a7f53c2a2628935080ff1 @rossabaker rossabaker committed Jan 23, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −1 src/main/g8/build.sbt
  2. +0 −1 src/main/g8/src/main/scala/$servlet_name$.scala
View
@@ -13,7 +13,7 @@ libraryDependencies ++= Seq(
"org.scalatra" %% "scalatra-scalate" % "2.1.0-SNAPSHOT",
"org.scalatra" %% "scalatra-specs2" % "2.1.0-SNAPSHOT" % "test",
"ch.qos.logback" % "logback-classic" % "1.0.0" % "runtime",
- "org.eclipse.jetty" % "jetty-webapp" % "8.1.0.RC1" % "container",
+ "org.eclipse.jetty" % "jetty-webapp" % "8.1.0.RC5" % "container",
"javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided"
)
@@ -1,5 +1,4 @@
import org.scalatra._
-import java.net.URL
import scalate.ScalateSupport
class $servlet_name$ extends ScalatraServlet with ScalateSupport {

0 comments on commit b389e8d

Please sign in to comment.