remove duplicate variable names

fixes the merge conflict in src/main/java/gsn/http/restapi/RequestHandler.java
kjorg50 · Oct 27, 2014 · c573f76 · c573f76
1 parent 1a54796
commit c573f76
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/main/java/gsn/http/restapi/RequestHandler.java b/src/main/java/gsn/http/restapi/RequestHandler.java
@@ -890,8 +890,6 @@ private Map<String, String> createHeaderMap(VSensorConfig vsconf){
 
 
     //properties file
-    private static final String STRING_CONSTANTS_PROPERTIES_FILENAME = "conf/RestApiConstants.properties";
-    private static final String STRING_CONSTANTS_PROPERTIES_FILENAME = "src/main/resources/RestApiConstants.properties";
     private static final String STRING_CONSTANTS_PROPERTIES_FILENAME = "RestApiConstants.properties";
     private static Properties stringConstantsProperties = new Properties();
     private FileInputStream stringConstantsPropertiesFileInputStream= null;