From 621978e08deda39294ea377aabbd8a93e5c11f9c Mon Sep 17 00:00:00 2001 From: Timo Volkmann Date: Thu, 18 Apr 2019 12:59:02 +0200 Subject: [PATCH] resolved merge conflict --- frontend/quasar.conf.js | 7 ++++--- src/main/java/hhn/labsw/bugageocaching/Application.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index 8037bee..b175999 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -5,7 +5,8 @@ module.exports = function (ctx) { // app boot file (/src/boot) // --> boot files are part of "main.js" boot: [ - 'axios' + 'axios', + 'qr-scanner' ], css: [ @@ -106,8 +107,8 @@ module.exports = function (ctx) { API: JSON.stringify('http://localhost:8080') } : { // Base URL for API-Calls: PRODUCTION (build) - //API: JSON.stringify('http://localhost:8080') - API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching') + //API: JSON.stringify('http://se.hs-heilbronn.de:8090') + API: JSON.stringify('http://localhost:8080') } }, diff --git a/src/main/java/hhn/labsw/bugageocaching/Application.java b/src/main/java/hhn/labsw/bugageocaching/Application.java index f7d101c..75f1fb0 100644 --- a/src/main/java/hhn/labsw/bugageocaching/Application.java +++ b/src/main/java/hhn/labsw/bugageocaching/Application.java @@ -15,7 +15,7 @@ public class Application extends SpringBootServletInitializer{ return application.sources(Application.class); } - public static void main(String[] args) throws Exception { + public static void main(String[] args) { SpringApplication.run(Application.class, args); } }