git conflict

Author: Holger Badorreck

dpdata/vasp/outcar.py

@@ -23,7 +23,7 @@ def system_info(lines, type_idx_zero = False):
                 atom_names.append(_ii.split('_')[0])
             else:
                 atom_names.append(_ii)
-        #a stricker check for "NELM"; compatible with distingct formats in different versions(6 and older, newers_expect-to-work) of vasp
+        # a stricker check for "NELM"; compatible with distingct formats in different versions(6 and older, newers_expect-to-work) of vasp
         elif nelm is None:
             m = re.search(r'NELM\s*=\s*(\d+)', ii)
             if m: