Fixing conflict for SignatureDetector.java.
authorrtrimana <rtrimana@uci.edu>
Tue, 9 Oct 2018 00:42:33 +0000 (17:42 -0700)
committerrtrimana <rtrimana@uci.edu>
Tue, 9 Oct 2018 00:42:33 +0000 (17:42 -0700)
1  2 
Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_test.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" />
@@@ -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" />