Remove leftovers from merge

7 years ago · e5534d6017
parent b1f4ee47d1
commit e5534d6017
1 changed files with 0 additions and 3 deletions
--- a/srsepc/epc.conf.example
+++ b/srsepc/epc.conf.example
@ -10,12 +10,9 @@
 # tac:              16-bit Tracking Area Code.
 # mcc:              Mobile Country Code
 # mnc:              Mobile Network Code
-<<<<<<< HEAD
 # mme_bindx_addr:   IP subnet to listen for eNB S1 connnections
 # apn:		        Set Access Point Name (APN)
-=======
 # mme_bind_addr:    IP bind addr to listen for eNB S1 connnections
->>>>>>> epc
 #
 #####################################################################
 [mme]