Remove leftovers from merge

master
Andre Puschmann 7 years ago committed by GitHub
parent b1f4ee47d1
commit e5534d6017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -10,12 +10,9 @@
# tac: 16-bit Tracking Area Code. # tac: 16-bit Tracking Area Code.
# mcc: Mobile Country Code # mcc: Mobile Country Code
# mnc: Mobile Network Code # mnc: Mobile Network Code
<<<<<<< HEAD
# mme_bindx_addr: IP subnet to listen for eNB S1 connnections # mme_bindx_addr: IP subnet to listen for eNB S1 connnections
# apn: Set Access Point Name (APN) # apn: Set Access Point Name (APN)
=======
# mme_bind_addr: IP bind addr to listen for eNB S1 connnections # mme_bind_addr: IP bind addr to listen for eNB S1 connnections
>>>>>>> epc
# #
##################################################################### #####################################################################
[mme] [mme]

Loading…
Cancel
Save