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)
commitc97e080c97a2efce5db17e4e24e67db97fa05643
tree0c31b80a9347ea047604dd3951d044a3f334c298
parent1ed1d61f9b357b0f2e9aed36d3aac6f8cd68d1d3
parentefc3022974a49b23c1f58e9a613cb6a7291b80b5
Fixing conflict for SignatureDetector.java.
Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_main.iml
Code/Projects/SmartPlugDetector/.idea/modules/SmartPlugDetector_test.iml