)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":4523,"name":"Eric Harney","email":"eharney@redhat.com","username":"eharney"},"change_message_id":"73176f1444fd2304cf61f32dd6826f488efe4acd","unresolved":false,"context_lines":[{"line_number":22,"context_line":"Co-Authored-By: Ivan Kolodyazhny \u003ce0ne@e0ne.info\u003e"},{"line_number":23,"context_line":"Change-Id: Ie8011fc83bc41edd2768ade6d42d737b4598ca2d"},{"line_number":24,"context_line":"Closes-Bug: #1865754"},{"line_number":25,"context_line":"(cherry picked from commit 3e831480c29c07128f36ae67c44c25177b3d9f36)"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"9f560f44_cf6741b7","line":25,"updated":"2020-09-03 13:02:31.000000000","message":"Please leave the \"Conflicts:\" lines on the commit message when manually resolving conflicts.","commit_id":"11c5a37bf5bf67123a08a702b97bbd1ccc8699db"}],"os_brick/tests/initiator/connectors/test_rbd.py":[{"author":{"_account_id":4523,"name":"Eric Harney","email":"eharney@redhat.com","username":"eharney"},"change_message_id":"73176f1444fd2304cf61f32dd6826f488efe4acd","unresolved":false,"context_lines":[{"line_number":285,"context_line":"    @mock.patch.object(rbd.RBDConnector, \u0027_get_rbd_args\u0027)"},{"line_number":286,"context_line":"    @mock.patch.object(rbd.RBDConnector, \u0027create_non_openstack_config\u0027)"},{"line_number":287,"context_line":"    @mock.patch.object(rbd.RBDConnector, \u0027_execute\u0027)"},{"line_number":288,"context_line":"    def test__local_attach_volume_non_openstack(self, mock_execute,"},{"line_number":289,"context_line":"                                                mock_rbd_cfg, mock_args):"},{"line_number":290,"context_line":"        mock_args.return_value \u003d [mock.sentinel.rbd_args]"},{"line_number":291,"context_line":""}],"source_content_type":"text/x-python","patch_set":1,"id":"9f560f44_4f5cd1ec","line":288,"updated":"2020-09-03 13:02:31.000000000","message":"This came from a different commit, looks like a conflict resolution error.","commit_id":"11c5a37bf5bf67123a08a702b97bbd1ccc8699db"}]}