Skip to content

Commit

Permalink
Merge pull request LSIR#1 from UCSB-CS-RACELab/merge-fix
Browse files Browse the repository at this point in the history
remove duplicate variable names
  • Loading branch information
kjorg50 committed Oct 27, 2014
2 parents 1a54796 + c573f76 commit d2a845d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/main/java/gsn/http/restapi/RequestHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d2a845d

Please sign in to comment.