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/1960082a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1960082a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1960082a Branch: refs/heads/3.1.x-fixes Commit: 1960082af04b913d30adf187b8395092196d15cc Parents: 03dd596 Author: Daniel Kulp <dk...@apache.org> Authored: Wed Mar 29 08:35:17 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Mar 29 08:35:36 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1960082a/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 3cea21c..15bfc89 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -342,6 +342,7 @@ M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9 M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3 M 11637433df089a638e173d1ef57441e7456cf2ea M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17 +M 11a1e4ef71053e7deca6bd323f5cd27fd9bc6da4 M 11e18bf5622cafdb10723cee895885d676b35a7b M 127acfcf24207eef314efe9ffd72e5a032e02ee1 M 13d33c9ed261e06e44706cffa1671d67d31096a7 @@ -408,6 +409,7 @@ M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1 M 726c0aa641e408a18fa5f4ff82df682d489874f4 M 7304dfbd8f3044d8d46981abf2058c6cb732d219 M 746914a5084f5db8d0c0f052802c7ef2217b9b6b +M 74a5139520ac289d3a6d93da14573ef7501b8d1d M 74b8db2dcc5fc60a513d9e73e258aeba99727a39 M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81 M 7ace8c84cff4696e365800fbba12cc789e97971f @@ -471,6 +473,7 @@ M b418fd7952dc36f1a3e577e457833588a2056104 M b433c753d44350daff5a40ff8eb5a149cf557a68 M b49075882641fcebbbdf1ed8d84247fcf80aa558 M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b +M be2bf8d644887fc1853210b9b82db897c4d73dd0 M c01c68ddda10ec6db492b86d818498bec0bf4228 M c212240f696e3387df19bbcf22d1851aff320078 M c2b13b7473781c3c1a4225a01c319cf8aa92cd0f
