From 693869e1f15bc4c94e2ab4cd2b0461b9d396af56 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 14 Dec 2018 06:09:58 +0000
Subject: [PATCH] merlin -> borgbutler.

---
 borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
index 1f153e8..38a84fa 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
@@ -76,7 +76,7 @@
         try {
             Path path;
             if (RunningMode.isDevelopmentMode()) {
-                path = Paths.get(ServerConfiguration.getApplicationHome(), "merlin-webapp", "build");
+                path = Paths.get(ServerConfiguration.getApplicationHome(), "borgbutler-webapp", "build");
             } else {
                 path = Paths.get(ServerConfiguration.getApplicationHome(), "web");
             }

--
Gitblit v1.10.0