Resolving merge conflict in Main.java
authorrtrimana <rtrimana@uci.edu>
Wed, 25 Apr 2018 00:51:26 +0000 (17:51 -0700)
committerrtrimana <rtrimana@uci.edu>
Wed, 25 Apr 2018 00:51:26 +0000 (17:51 -0700)
commitc6c2dd6d2952b2a740caa24d7f28ce6e0ddf4be8
tree57adfc0d7e5fd27cbf56f00de4100ec0ac87c3d5
parent84446f11cd7c1a809b5d1a9b3d720f465aa344ad
parentc8c59ea37986428b0743ce9ad21c74a748071edc
Resolving merge conflict in Main.java
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java