Fixed merge conflict.

This commit is contained in:
Matt Guthaus 2017-06-05 09:10:57 -07:00
commit 0b094076dc
1 changed files with 0 additions and 1 deletions

View File

@ -38,7 +38,6 @@ class lib_test(unittest.TestCase):
libname = OPTS.openram_temp + filename libname = OPTS.openram_temp + filename
lib.lib(libname=libname,sram=s,spfile=tempspice,use_model=True) lib.lib(libname=libname,sram=s,spfile=tempspice,use_model=True)
# let's diff the result with a golden model # let's diff the result with a golden model
golden = "{0}/golden/{1}".format(os.path.dirname(os.path.realpath(__file__)),filename) golden = "{0}/golden/{1}".format(os.path.dirname(os.path.realpath(__file__)),filename)
# Randomly decided 1% difference between spice simulators is ok. # Randomly decided 1% difference between spice simulators is ok.