<p>herlesupreeth has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/16953">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fixing mistakes of rebase<br><br>Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844<br>---<br>M pySim/cards.py<br>1 file changed, 0 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/16953/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 1973fbd..249f6c5 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -87,11 +87,7 @@</span><br><span> </span><br><span>  def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'):</span><br><span>            """</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD</span><br><span>          See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">-                           See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card</span><br><span>             """</span><br><span>           # get size and write EF.OPLMNwAcT</span><br><span>            data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)</span><br><span>@@ -103,11 +99,7 @@</span><br><span> </span><br><span>       def update_plmn_act(self, mcc, mnc, access_tech='FFFF'):</span><br><span>             """</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD</span><br><span>          See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">-                           See note in update_hplmn_act()</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card</span><br><span>             """</span><br><span>           # get size and write EF.PLMNwAcT</span><br><span>             data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)</span><br><span>@@ -132,11 +124,7 @@</span><br><span>           #See also: 3GPP TS 31.102, chapter 4.2.18</span><br><span>            mnclen = len(str(mnc))</span><br><span>               if mnclen == 1:</span><br><span style="color: hsl(0, 100%, 40%);">-<<<<<<< HEAD</span><br><span>                     mnclen = 2</span><br><span style="color: hsl(0, 100%, 40%);">-=======</span><br><span style="color: hsl(0, 100%, 40%);">-                               mnclen = 2</span><br><span style="color: hsl(0, 100%, 40%);">->>>>>>> Fixed messy indentation and added ability to write HPLMN_ACT in Sysmocom Card</span><br><span>                 if mnclen > 3:</span><br><span>                    raise RuntimeError('unable to calculate proper mnclen')</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/16953">change 16953</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/16953"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iba2ff8d3e007a0c08897d08f101be565ae8bd844 </div>
<div style="display:none"> Gerrit-Change-Number: 16953 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>