Resolve conflict.. (whoops..)

2026-08-11 11:26:01 +08:00 · 2014-04-14 09:46:05 -07:00
parent 3c2f5fbfee
commit 37e957ad07
1 changed files with 0 additions and 3 deletions
@@ -209,10 +209,7 @@ class BaseRx(object):
    def nD(self):
        return self.locs.shape[0]

-<<<<<<< HEAD

-=======
->>>>>>> dbd1334e0bf48dedc12f744841e71725a9d98d50
 class BaseTx(object):
    """SimPEG Transmitter Object"""