Resolving merge conflict

MaximeAgez · May 18, 2020 · 863f479 · 863f479
2 parents a109885 + 7d5e5d4
commit 863f479
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/pylcaio.py b/src/pylcaio.py
@@ -1090,8 +1090,7 @@ def save_system(self, format):
                                                                             self.io_database_name_and_version +
                                                                             '_STAM/')):
                 os.mkdir(pkg_resources.resource_filename(__name__, '/Databases/' + self.lca_database_name_and_version +
-                                                         '_' + self.io_database_name_and_version +
-                                                         '_STAM/'))
+                                                         '_' + self.io_database_name_and_version +'_STAM/'))
             if not os.path.exists(pkg_resources.resource_filename(__name__, '/Databases/' +
                                                                             self.lca_database_name_and_version + '_' +
                                                                             self.io_database_name_and_version +