From c573f76b1f8b534a70d0d06d9fa2e05cd80a2775 Mon Sep 17 00:00:00 2001
From: Kyle Jorgensen <kylewjorgensen@gmail.com>
Date: Sun, 26 Oct 2014 19:27:19 -0700
Subject: [PATCH] remove duplicate variable names fixes the merge conflict in
 src/main/java/gsn/http/restapi/RequestHandler.java

---
 src/main/java/gsn/http/restapi/RequestHandler.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/gsn/http/restapi/RequestHandler.java b/src/main/java/gsn/http/restapi/RequestHandler.java
index 5837b05d1..35aa02d70 100644
--- 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;