Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aa00a2db Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aa00a2db Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aa00a2db Branch: refs/heads/3.0.x-fixes Commit: aa00a2db2226dd6f99dc9ecf58dfed5cd0bf9f17 Parents: 5080508 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Apr 5 12:51:17 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Apr 5 12:51:17 2017 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/aa00a2db/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index d576a02..d124dd1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -220,6 +220,7 @@ B 21a7f538c3e91d2f5b0c1250c866ea43405bcb42 B 21d5de9ffc7b47c8704ec312fe7234304fbd0df1 B 21f50ebda6a66a4ae3860dd95b63add684546ced B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 +B 22a58c399ccdb94f5969ab3be9dfad46cf222af2 B 22a9780de14857d7320c41506b23e02b55cd4d05 B 22aeab948c344aee666cafbeb5979a2e99748843 B 22d0c244d3b60aafbd3c070e9599012019de486c @@ -516,6 +517,7 @@ B 4b71edb65b4e24f390b222dbb0cad6f1b533ce66 B 4b76cb4d35d175ec3ba98ea1286859503e055374 B 4bc00dc9e621b2d61764bfbe24c82042a784d083 B 4bc0c5e52615dac9db94b6fdcd73065a48eb1411 +B 4bca17bcaa911ff4f90d4d610e2ce0b974f68f96 B 4bdbdf6cd2f15560a950aa6f1aebc8aa8f78ac2c B 4c64e8b5f8af67d2e163ad575fd6e7191c6636d1 B 4c687895d918deb69cba4f50e62a3746a71b4130 @@ -1721,6 +1723,7 @@ M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 1946e323a0df6e5f9748af82106cff39d7b5d01f M 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0 M 1a4c2ac162b2b67b14e8ad12b06ca87e443dccc4 +M 1a4fe22fc297f8be204788bcdfcd498e91201a01 M 1b5e4078c3b14cf249f39607b1bb2b676d236747 M 1b91b6e630bec0980d94bd04b016748af525d9bd M 1baae69592a128462ef252916bccfb67cd81095b
