aboutsummaryrefslogtreecommitdiff
path: root/kamon-playground/src/main/resources/application.conf
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-08-29 02:44:47 -0300
committerDiego <diegolparra@gmail.com>2014-08-29 02:44:47 -0300
commit83dc815df9d760dd03f76e5d8dfe2d5d5274a296 (patch)
tree60f000fbdcec5b4d3e7f84e940c90989b30e0d89 /kamon-playground/src/main/resources/application.conf
parentdc5c3fb65085af225464768e0e672075713135d6 (diff)
downloadKamon-83dc815df9d760dd03f76e5d8dfe2d5d5274a296.tar.gz
Kamon-83dc815df9d760dd03f76e5d8dfe2d5d5274a296.tar.bz2
Kamon-83dc815df9d760dd03f76e5d8dfe2d5d5274a296.zip
= core: fix errors in last commit
Diffstat (limited to 'kamon-playground/src/main/resources/application.conf')
-rw-r--r--kamon-playground/src/main/resources/application.conf5
1 files changed, 0 insertions, 5 deletions
diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf
index a870dc6b..1bcf6708 100644
--- a/kamon-playground/src/main/resources/application.conf
+++ b/kamon-playground/src/main/resources/application.conf
@@ -1,11 +1,6 @@
akka {
loglevel = INFO
-<<<<<<< Updated upstream
-=======
- extensions = ["kamon.logreporter.LogReporter"]
-
->>>>>>> Stashed changes
actor {
debug {
unhandled = on