From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url

---
 borgbutler-server/src/main/resources/log4j.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/borgbutler-server/src/main/resources/log4j.properties b/borgbutler-server/src/main/resources/log4j.properties
index 141c0c5..03a0e14 100644
--- a/borgbutler-server/src/main/resources/log4j.properties
+++ b/borgbutler-server/src/main/resources/log4j.properties
@@ -14,7 +14,7 @@
 
 log4j.appender.file=org.apache.log4j.RollingFileAppender
 
-log4j.appender.file.File=merlin.log
+log4j.appender.file.File=borgbutler.log
 log4j.appender.file.MaxFileSize=10MB
 log4j.appender.file.MaxBackupIndex=5
 log4j.appender.file.layout=org.apache.log4j.PatternLayout

--
Gitblit v1.10.0