]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
git merge failure fixed. wrong side of the merge was kept in previous commit
authorWilliam King <william.king@quentustech.com>
Mon, 20 Aug 2012 17:27:39 +0000 (10:27 -0700)
committerWilliam King <william.king@quentustech.com>
Mon, 20 Aug 2012 17:27:39 +0000 (10:27 -0700)
commit802af6e5cb045ba3a59b46f167ced4c0f54622ba
treed521f0a27648d3244111778c0a249fb0743d4cd6
parent7f74f7fbc834f6153cf9edb983317a38a8137187
git merge failure fixed. wrong side of the merge was kept in previous commit
src/mod/xml_int/mod_xml_radius/mod_xml_radius.c