From 3e499ccd563f7de45a67e079910f1f62bffeae51 Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Wed, 15 Jan 2014 16:49:17 +0000
Subject: [PATCH] Blocked revisions 405587

........
Remove subversion conflict tag accidentally left in CHANGES


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-- 
GitLab