Change in pysim[master]: Fixing mistakes of rebase

[herlesupreeth]

herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16953 )


Change subject: Fixing mistakes of rebase
......................................................................

Fixing mistakes of rebase

Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844
---
M pySim/cards.py
1 file changed, 0 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/16953/1

diff --git a/pySim/cards.py b/pySim/cards.py
index 1973fbd..249f6c5 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -87,11 +87,7 @@
 
 	def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'):
 		"""
-<<<<<<< HEAD
 		See note in update_hplmn_act()
-=======
-				See note in update_hplmn_act()
->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card
 		"""
 		# get size and write EF.OPLMNwAcT
 		data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)
@@ -103,11 +99,7 @@
 
 	def update_plmn_act(self, mcc, mnc, access_tech='FFFF'):
 		"""
-<<<<<<< HEAD
 		See note in update_hplmn_act()
-=======
-				See note in update_hplmn_act()
->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card
 		"""
 		# get size and write EF.PLMNwAcT
 		data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)
@@ -132,11 +124,7 @@
 		#See also: 3GPP TS 31.102, chapter 4.2.18
 		mnclen = len(str(mnc))
 		if mnclen == 1:
-<<<<<<< HEAD
 			mnclen = 2
-=======
-				mnclen = 2
->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card
 		if mnclen > 3:
 			raise RuntimeError('unable to calculate proper mnclen')
 

-- 
To view, visit https://gerrit.osmocom.org/c/pysim/+/16953
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844
Gerrit-Change-Number: 16953
Gerrit-PatchSet: 1
Gerrit-Owner: herlesupreeth <herlesupreeth at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200120/2ebd60c3/attachment.htm>