Skip to content
This repository has been archived by the owner on Apr 23, 2019. It is now read-only.

Fix typo #106

Closed
wants to merge 34 commits into from
Closed

Fix typo #106

wants to merge 34 commits into from

Conversation

rstento
Copy link

@rstento rstento commented Jan 23, 2018

Fixes #96. @marcospereira, please check. I fixed it as described in the issue.

wsargent and others added 30 commits February 18, 2017 15:54
  /LICENSE:
    wrote /LICENSE
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.13")
Upgrade branch master using TemplateControl
  /LICENSE:
    wrote /LICENSE
  **/build.sbt:
    libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "2.0.0" % Test
Upgrade branch master using TemplateControl
  /LICENSE:
    wrote /LICENSE
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.14")
Upgrade branch master using TemplateControl
  /LICENSE:
    wrote /LICENSE
  **/build.properties:
    sbt.version=0.13.15
Upgrade branch master using TemplateControl
  /LICENSE:
    wrote /LICENSE
  **/build.sbt:
    scalaVersion := "2.11.11"
  **/build.sbt:
    scalaVersion := "2.11.11"
Upgrade branch master using TemplateControl
Fix ECS url and add note to Java API example
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.15")
Upgrade branch 2.5.x using TemplateControl
adding sample unit and functional tests and sbteclipse plugin
adding more tests and improving existing ones
**/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.16")
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.17")
@rstento
Copy link
Author

rstento commented Jan 23, 2018

I must have made a mistake, I'm not sure why my PR includes all of these other changes. I'm closing it.

@rstento rstento closed this Jan 23, 2018
@marcospereira marcospereira changed the base branch from 2.6.x to 2.5.x January 23, 2018 16:56
@marcospereira marcospereira changed the base branch from 2.5.x to 2.6.x January 23, 2018 16:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants