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

index 740525ed894d42070ccebfad2ab6d5fbce38e0a3,9353a451329fce1ecfe0f46bc62f7999c5981eb9..15e9a3074ca899f0e547133ffbcf7a6c99c6e351
@@@ -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" />
@@@ -13,6 -13,7 +12,7 @@@
      <orderEntry type="library" name="Gradle: org.pcap4j:pcap4j-core:2.0.0-alpha" level="project" />
      <orderEntry type="library" name="Gradle: org.slf4j:slf4j-jdk14:1.8.0-beta2" level="project" />
      <orderEntry type="library" name="Gradle: org.apache.commons:commons-math3:3.6.1" level="project" />
+     <orderEntry type="library" name="Gradle: org.jgrapht:jgrapht-core:1.2.0" level="project" />
      <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.8.0-beta2" level="project" />
      <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.2.1" level="project" />
    </component>
index 8d4ae84e7bb669546c9cd219c3748bd37f5964ba,d10f1b08b3c638d79bd30900dcc39157f37f4a83..d8e41140eb7f3741c6093c5cab6c4106bb1556e4
@@@ -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" />
@@@ -14,6 -14,7 +13,7 @@@
      <orderEntry type="library" name="Gradle: org.pcap4j:pcap4j-core:2.0.0-alpha" level="project" />
      <orderEntry type="library" name="Gradle: org.slf4j:slf4j-jdk14:1.8.0-beta2" level="project" />
      <orderEntry type="library" name="Gradle: org.apache.commons:commons-math3:3.6.1" level="project" />
+     <orderEntry type="library" name="Gradle: org.jgrapht:jgrapht-core:1.2.0" level="project" />
      <orderEntry type="library" name="Gradle: junit:junit:4.11" level="project" />
      <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.8.0-beta2" level="project" />
      <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.2.1" level="project" />