Resolving conflict.
authorrtrimana <rtrimana@uci.edu>
Mon, 17 Sep 2018 23:30:54 +0000 (16:30 -0700)
committerrtrimana <rtrimana@uci.edu>
Mon, 17 Sep 2018 23:30:54 +0000 (16:30 -0700)
commitf314a6e02dad77f006f7acea08d3304569fc5ea9
tree8f4286da95aa15555123888b8194823c11327e52
parent26462c63738130dd6f7ef8b406b308c8d87abe6f
parentac0111289c4afdf76a921deef82db7a90cabd9a0
Resolving conflict.
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java