Fixed merge conflict.

2017-06-05 09:10:57 -07:00 · 2017-06-05 09:10:57 -07:00 · 0b094076dc
parent d20ea65923 0acbf43908
commit 0b094076dc
1 changed files with 0 additions and 1 deletions
--- a/compiler/tests/23_lib_sram_model_test.py
+++ b/compiler/tests/23_lib_sram_model_test.py
@ -37,7 +37,6 @@ class lib_test(unittest.TestCase):
        filename = s.name + "_analytical.lib"
        libname = OPTS.openram_temp + filename
        lib.lib(libname=libname,sram=s,spfile=tempspice,use_model=True)
-        

        # let's diff the result with a golden model
        golden = "{0}/golden/{1}".format(os.path.dirname(os.path.realpath(__file__)),filename)