Resolving conclicts manually.
authorrtrimana <rtrimana@uci.edu>
Thu, 1 Aug 2019 22:56:09 +0000 (15:56 -0700)
committerrtrimana <rtrimana@uci.edu>
Thu, 1 Aug 2019 22:56:09 +0000 (15:56 -0700)
commit6b2556e42d662151c71027292986099a0fd44514
tree20de6965e7501056e463759971b9fbf15cc5ef86
parent1be0ecc74c3da400b32a4f888bab4b9b1b6b2569
parentd09f937c88170b4f5691eb2602aed3612e0d750c
Resolving conclicts manually.