[Asterisk-code-review] Update UPGRADE file for 13 branch (asterisk[master])

[Javier Acosta]

Javier Acosta has uploaded a new change for review.

  https://gerrit.asterisk.org/2694

Change subject: Update UPGRADE file for 13 branch
......................................................................

Update UPGRADE file for 13 branch

Change-Id: Ib85ecff92528c34b93c00788c68c794b1dd4e9a6
---
M UPGRADE.txt
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/94/2694/1

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 131ce6c..07487bb 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -22,6 +22,7 @@
 === UPGRADE-13.txt  -- Upgrade info for 12 to 13
 ===========================================================
 
+<<<<<<< HEAD
 Channel Drivers:
 
 chan_dahdi:
@@ -78,6 +79,8 @@
    result in detection as a machine.  This means that you should update this
    value to be one higher than your previos value, if your previous value
    was working well for you.
+=======
+>>>>>>> 8b560be... Update UPGRADE file for 13 branch
 
 ===========================================================
 ===========================================================

-- 
To view, visit https://gerrit.asterisk.org/2694
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib85ecff92528c34b93c00788c68c794b1dd4e9a6
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Javier Acosta <javier.acosta at beeonline.es>