aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-04-17 14:37:10 +0200
committerMicael Karlberg <[email protected]>2013-04-17 14:37:10 +0200
commit1dcfcb31c8d5f0f23e0b836ea0aa85277c71ee17 (patch)
tree3d35a256cfa257314c8175288bb799fad7be81a1 /lib/megaco
parent10ca34488869c17cbd2d1a14ede4f4a8af67726e (diff)
downloadotp-1dcfcb31c8d5f0f23e0b836ea0aa85277c71ee17.tar.gz
otp-1dcfcb31c8d5f0f23e0b836ea0aa85277c71ee17.tar.bz2
otp-1dcfcb31c8d5f0f23e0b836ea0aa85277c71ee17.zip
[megaco] Fix merge
Diffstat (limited to 'lib/megaco')
-rw-r--r--lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src b/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
index e143450ea9..24a0366f58 100644
--- a/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
+++ b/lib/megaco/src/flex/megaco_flex_scanner_drv.flex.src
@@ -1,14 +1,8 @@
/*
* %CopyrightBegin%
-<<<<<<< HEAD
- *
- * Copyright Ericsson AB 2001-2011. All Rights Reserved.
- *
-=======
*
* Copyright Ericsson AB 2001-2013. All Rights Reserved.
*
->>>>>>> bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
* compliance with the License. You should have received a copy of the