aboutsummaryrefslogtreecommitdiff
path: root/kamon-playground/src/main/resources/application.conf
diff options
context:
space:
mode:
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