diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-08-04 23:53:12 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-08-04 23:53:12 -0300 |
| commit | 004349da1efa8e4639db008bab5b7ae45d8c95af (patch) | |
| tree | ccb0449e258d344e292b0ec25bdedbf59c39f544 /version.sbt | |
| parent | a304fbb8d30f16923ab4d6b03c47b9a95f7f3529 (diff) | |
| parent | 1256ed00ebb9496bfc67637526cf269acd4ea6fa (diff) | |
| download | Kamon-004349da1efa8e4639db008bab5b7ae45d8c95af.tar.gz Kamon-004349da1efa8e4639db008bab5b7ae45d8c95af.tar.bz2 Kamon-004349da1efa8e4639db008bab5b7ae45d8c95af.zip | |
Merge branch 'master' into release-0.3_scala-2.11
Conflicts:
version.sbt
Diffstat (limited to 'version.sbt')
| -rw-r--r-- | version.sbt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.sbt b/version.sbt index f45dd2d1..8811f264 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.3.3-SNAPSHOT" +version in ThisBuild := "0.3.3-SNAPSHOT"
\ No newline at end of file |