{"shas":[["c18174c0ece0e62e7f6b975b6a3c79a3a418f93c","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","Merge branch 'master' into ak-fix\n\nResolved Conflicts:\n\tsrc/GPU/pair_cg_cmm_gpu.cpp\n\tsrc/read_data.cpp","Axel Kohlmeyer"],["78b0055319f211839e6245c47f6ef2de60f47110","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","Merge branch 'ak-fix' into openmp-step2\n\nResolved Conflicts:\n\tsrc/COLLOID/pair_colloid.cpp\n\tsrc/pair_table.cpp","Axel Kohlmeyer"],["cf6646e50853b093b16292f0dbba68d047d8608b","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","update error handling to match upstream changes","Axel Kohlmeyer"],["56f9b4512de797d3f210747d3ab77d1c4fe5f4ef","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","remove duplicated text","Axel Kohlmeyer"],["1796461d27a70bc19fda3b39ab68d567d87555e7","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","whitespace fixes","Axel Kohlmeyer"],["e7f70047243cd1f37f582c2a9727d1610c3bc8b0","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","whitespace fixes","Axel Kohlmeyer"],["8aad0f31e0990295b79625a125ad30f8a308c43b","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","some small updates and corrections","Axel Kohlmeyer"],["700950ade79d4bce0e7dbf2f09054c33bc79340e","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","fix typo","Axel Kohlmeyer"],["db7257cc231e2b25fae1a73018f354dc83854db8","45a86a7fe289628ec4c0eb16366a1dc6ffd3b03c@gmail.com","Merge branch 'ak-fix' into openmp-step2","Axel Kohlmeyer"]],"ref":"refs/heads/openmp-master","size":9,"head":"db7257cc231e2b25fae1a73018f354dc83854db8","push_id":43869297}