Fixing serialization bug caused by git automerge
authorHamed Gorjiara <hgorjiar@uci.edu>
Thu, 2 Nov 2017 18:30:02 +0000 (11:30 -0700)
committerHamed Gorjiara <hgorjiar@uci.edu>
Thu, 2 Nov 2017 18:30:02 +0000 (11:30 -0700)
commitc3319c10eddcd65568864d7642b665ca95d6d12f
tree480d09010d0ea13b89bea7c4c80c0dca639be724
parenta81fa2318fde9ebaa3a0cf1604ab23ed85c3a9a7
Fixing serialization bug caused by git automerge
src/Serialize/serializer.cc