From: rtrimana <rtrimana@uci.edu>
Date: Tue, 9 Oct 2018 00:42:33 +0000 (-0700)
Subject: Fixing conflict for SignatureDetector.java.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=pingpong.git;a=commitdiff_plain;h=c97e080c97a2efce5db17e4e24e67db97fa05643;ds=inline

Fixing conflict for SignatureDetector.java.
---

c97e080c97a2efce5db17e4e24e67db97fa05643
diff --cc Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
index 740525e,9353a45..15e9a30
--- a/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 8d4ae84,d10f1b0..d8e4114
--- a/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" />