Fixing conflict for SignatureDetector.java.

diff --cc Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
index 740525ed894d42070ccebfad2ab6d5fbce38e0a3,9353a451329fce1ecfe0f46bc62f7999c5981eb9..15e9a3074ca899f0e547133ffbcf7a6c99c6e351
--- 1/Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
--- 2/Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
+++ b/Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
@@@ -5,7 -5,7 +5,6 @@@
      <exclude-output />
      <content url="file://$MODULE_DIR$/../../src/main">
        <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
--      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
      </content>
      <orderEntry type="inheritedJdk" />
      <orderEntry type="sourceFolder" forTests="false" />

diff --cc Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_test.iml
index 8d4ae84e7bb669546c9cd219c3748bd37f5964ba,d10f1b08b3c638d79bd30900dcc39157f37f4a83..d8e41140eb7f3741c6093c5cab6c4106bb1556e4
--- 1/Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_test.iml
--- 2/Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_test.iml
+++ b/Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_test.iml
@@@ -5,7 -5,7 +5,6 @@@
      <exclude-output />
      <content url="file://$MODULE_DIR$/../../src/test">
        <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
--      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
      </content>
      <orderEntry type="inheritedJdk" />
      <orderEntry type="sourceFolder" forTests="false" />