{"shas":[["6813877d9b98cc28e21ee31b03e71a385c0e7ab8","2275b61911649c8776b4ed8abdf2c374db3690e5@doc.ic.ac.uk","Resolving merge conflict on op_lib.cpp\n\nMerge branch 'master' of github.com:mh2308-iclondon/OP2_Lib_Airfoil_SSEAVX\n\nConflicts:\n\top2_31may11/common/op_lib.cpp","Matthias Hueser"],["703bcb8e446dbfcdf80a6c8ea893d976f0d3bfa4","2275b61911649c8776b4ed8abdf2c374db3690e5@doc.ic.ac.uk","N/A\n\nMerge branch 'master' of github.com:mh2308-iclondon/OP2_Lib_Airfoil_SSEAVX\n\nConflicts:\n\top2_31may11/common/op_lib.cpp","Matthias Hueser"]],"ref":"refs/heads/master","size":2,"head":"703bcb8e446dbfcdf80a6c8ea893d976f0d3bfa4","push_id":40743033}