From 927d1d5b61a339f9074beb30a080f569d4d0258e Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Tue, 23 Sep 2014 16:28:07 +0200
Subject: Removed some out-commented code and merged getUploadInfos(ImageData,
 filename) and getUploadInfos(ImageData) into one method.

---
 src/main/java/org/openslx/satellitedaemon/Globals.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/Globals.java b/src/main/java/org/openslx/satellitedaemon/Globals.java
index 72cd423..2cf594c 100644
--- a/src/main/java/org/openslx/satellitedaemon/Globals.java
+++ b/src/main/java/org/openslx/satellitedaemon/Globals.java
@@ -84,7 +84,7 @@ public class Globals {
 		try {
 			// Load all entries of the config file into properties
 			BufferedInputStream stream = new BufferedInputStream(
-					new FileInputStream("config/global.properties"));
+					new FileInputStream("config/global.properties.example"));
 			properties.load(stream);
 			stream.close();
 		} catch (IOException e) {
-- 
cgit v1.2.3-55-g7522