)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6549,"name":"Zhi Yan Liu","email":"lzy.dev@gmail.com","username":"lzy-dev"},"change_message_id":"3f9314ca1c77e7fc971058cb44861210167ac0a4","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Change-Id: I2625eb3888111829a9da4d093b34193b8795f264"},{"line_number":21,"context_line":"Signed-off-by: Zhi Yan Liu \u003czhiyanl@cn.ibm.com\u003e"},{"line_number":22,"context_line":"(cherry picked from commit 8160ae293383ec600c05fd2e4b38164bca7704c4)"},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"\tglance/tests/unit/v1/test_api.py"},{"line_number":25,"context_line":"\tglance/tests/unit/v1/test_registry_api.py"},{"line_number":26,"context_line":"\ttools/pip-requires"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"AAAATn%2F9qpc%3D","line":23,"updated":"2013-12-09 02:21:42.000000000","message":"Remove this four lines pls.","commit_id":"7089d96a1dc8537643ebc09eb7be891d555ba9ee"},{"author":{"_account_id":6484,"name":"Feilong Wang","email":"hustemb@gmail.com","username":"flwang"},"change_message_id":"505da46bc8e22c9bb4c88f8358ecdf626d2da4d7","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Change-Id: I2625eb3888111829a9da4d093b34193b8795f264"},{"line_number":21,"context_line":"Signed-off-by: Zhi Yan Liu \u003czhiyanl@cn.ibm.com\u003e"},{"line_number":22,"context_line":"(cherry picked from commit 8160ae293383ec600c05fd2e4b38164bca7704c4)"},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"\tglance/tests/unit/v1/test_api.py"},{"line_number":25,"context_line":"\tglance/tests/unit/v1/test_registry_api.py"},{"line_number":26,"context_line":"\ttools/pip-requires"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"AAAATn%2F9pn0%3D","line":23,"in_reply_to":"AAAATn%2F9pqs%3D","updated":"2013-12-09 09:43:55.000000000","message":"I agree these lines should be kept so as to reflect the conflicts. But how about replace those tabs with whitespaces?","commit_id":"7089d96a1dc8537643ebc09eb7be891d555ba9ee"},{"author":{"_account_id":6549,"name":"Zhi Yan Liu","email":"lzy.dev@gmail.com","username":"lzy-dev"},"change_message_id":"c0b82126cee13fd2aa2994f702aaa73cf8bbef09","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Change-Id: I2625eb3888111829a9da4d093b34193b8795f264"},{"line_number":21,"context_line":"Signed-off-by: Zhi Yan Liu \u003czhiyanl@cn.ibm.com\u003e"},{"line_number":22,"context_line":"(cherry picked from commit 8160ae293383ec600c05fd2e4b38164bca7704c4)"},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"\tglance/tests/unit/v1/test_api.py"},{"line_number":25,"context_line":"\tglance/tests/unit/v1/test_registry_api.py"},{"line_number":26,"context_line":"\ttools/pip-requires"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"AAAATn%2F9piA%3D","line":23,"in_reply_to":"AAAATn%2F9pqs%3D","updated":"2013-12-09 10:08:47.000000000","message":"woops, @Alan sorry!","commit_id":"7089d96a1dc8537643ebc09eb7be891d555ba9ee"},{"author":{"_account_id":1955,"name":"Alan Pevec","email":"alan.pevec@redhat.com","username":"apevec"},"change_message_id":"dd509ba3a021355320eecc85b7638abb783cb1ae","unresolved":false,"context_lines":[{"line_number":20,"context_line":"Change-Id: I2625eb3888111829a9da4d093b34193b8795f264"},{"line_number":21,"context_line":"Signed-off-by: Zhi Yan Liu \u003czhiyanl@cn.ibm.com\u003e"},{"line_number":22,"context_line":"(cherry picked from commit 8160ae293383ec600c05fd2e4b38164bca7704c4)"},{"line_number":23,"context_line":"Conflicts:"},{"line_number":24,"context_line":"\tglance/tests/unit/v1/test_api.py"},{"line_number":25,"context_line":"\tglance/tests/unit/v1/test_registry_api.py"},{"line_number":26,"context_line":"\ttools/pip-requires"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"AAAATn%2F9pqs%3D","line":23,"in_reply_to":"AAAATn%2F9qpc%3D","updated":"2013-12-09 09:35:48.000000000","message":"They\u0027re kept on purpose\n https://wiki.openstack.org/wiki/StableBranch#Proposing_Fixes","commit_id":"7089d96a1dc8537643ebc09eb7be891d555ba9ee"}]}