diff options
author | vlad <vlad@driver.xyz> | 2017-05-09 19:13:44 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-05-09 19:13:44 -0700 |
commit | 725f495a01adfb7885be65a47dd8003a60e4aea8 (patch) | |
tree | c375ddac89f920d2ac9ed2251044dbfec3c7a287 /README.md | |
parent | 5e095ce075227ea5690a621b8b3187936cc0cf75 (diff) | |
parent | 5989f12ee90a0e7d8210fad7a750e392c68e40fc (diff) | |
download | sbt-settings-725f495a01adfb7885be65a47dd8003a60e4aea8.tar.gz sbt-settings-725f495a01adfb7885be65a47dd8003a60e4aea8.tar.bz2 sbt-settings-725f495a01adfb7885be65a47dd8003a60e4aea8.zip |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# README.md
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -47,7 +47,7 @@ Do `sbt reload` after adding a plugin and changing project configuration. Artifact organization is set to `xyz.driver`. ### Scala compiler settings -Scala version — 2.11.8, flags configured: +Scala version — 2.11.11, flags configured: - Common settings: `-unchecked -feature -encoding utf8`, - _Advanced Scala features_: `-language:higherKinds -language:implicitConversions -language:postfixOps -language:reflectiveCalls`, |