From 57e040aec1aeb681629212f2296477497c912b45 Mon Sep 17 00:00:00 2001
From: Fabian Nonnenmacher <fabian.nonnenmacher@bosch-si.com>
Date: Fri, 5 Feb 2016 10:44:47 +0100
Subject: [PATCH] Fixup merge conflict

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
---
 .../java/org/eclipse/hawkbit/exception/SpServerError.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
index c7eb2b159..003b31cd7 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
@@ -185,8 +185,8 @@ public enum SpServerError {
     /**
      * 
      */
-    SP_CONFIGURATION_KEY_INVALID("hawkbit.server.error.configKeyInvalid", "The given configuration key is invalid.");
-            
+    SP_CONFIGURATION_KEY_INVALID("hawkbit.server.error.configKeyInvalid", "The given configuration key is invalid."),
+
     /**
      * 
      */