Merging conflicts.
authorrtrimana <rtrimana@uci.edu>
Tue, 6 Aug 2019 21:52:02 +0000 (14:52 -0700)
committerrtrimana <rtrimana@uci.edu>
Tue, 6 Aug 2019 21:52:02 +0000 (14:52 -0700)
commitbf32597a60d4f1ecf669bc4588552723e9a386ae
treee30e528f0de783113cf513f4683272b2d9be1424
parentef89c03ba3f5c7b61f30c8948a9170c36c91647f
parent8ba49a8979c5fb613134e2d0b5e5c6c0f456f85b
Merging conflicts.
GlobalVariables/GlobalVariablesEachApp.groovy