Cleanup bad rebase

This commit is contained in:
Neil Hanlon 2022-06-17 15:08:38 -04:00
parent e3526b1588
commit 3749866dee
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34

View File

@ -12,10 +12,6 @@ r.check_valid_arch()
#a = RepoSync(rlvars, config, major="9", repo="ResilientStorage", parallel=True, ignore_debug=False, ignore_source=False) #a = RepoSync(rlvars, config, major="9", repo="ResilientStorage", parallel=True, ignore_debug=False, ignore_source=False)
a = RepoSync(rlvars, config, major="9", repo="BaseOS", parallel=True, ignore_debug=False, ignore_source=False, hashed=True) a = RepoSync(rlvars, config, major="9", repo="BaseOS", parallel=True, ignore_debug=False, ignore_source=False, hashed=True)
<<<<<<< HEAD:iso/py/sync-from-peridot-test
#a.run()
=======
def run(): def run():
a.run() a.run()
>>>>>>> 8d29760 (Lets write some poetry):iso/empanadas/empanadas/scripts/sync-from-peridot-test.py