aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-07-03 14:39:10 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2014-07-03 14:39:10 -0300
commit2fd1958484dca0966610945ccadac4d69bf06bfd (patch)
tree3d6faacade1f5d56cb956605ba9c2876d8ad3ebe /project
parentb0df3654cb82d87971fa67ff56a2e183dc93358f (diff)
parent29068fc70a3e5a17a630c2c7fff951572bb5fa21 (diff)
downloadKamon-2fd1958484dca0966610945ccadac4d69bf06bfd.tar.gz
Kamon-2fd1958484dca0966610945ccadac4d69bf06bfd.tar.bz2
Kamon-2fd1958484dca0966610945ccadac4d69bf06bfd.zip
Merge branch 'wip/metrics-collection-refactor'
Conflicts: kamon-datadog/src/test/scala/kamon/datadog/DatadogMetricSenderSpec.scala
Diffstat (limited to 'project')
-rw-r--r--project/Settings.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/Settings.scala b/project/Settings.scala
index 5805192e..6cee3133 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -35,7 +35,7 @@ object Settings {
def formattingPreferences =
FormattingPreferences()
.setPreference(RewriteArrowSymbols, true)
- .setPreference(AlignParameters, true)
+ .setPreference(AlignParameters, false)
.setPreference(AlignSingleLineCaseStatements, true)
.setPreference(DoubleIndentClassDeclaration, true)
} \ No newline at end of file