From 7a9306df0032d4de64631df969ec6c87a32ecce3 Mon Sep 17 00:00:00 2001 From: Matteo Giantomassi Date: Fri, 19 Jul 2024 16:00:25 +0200 Subject: [PATCH] Fix conflicts --- pymatgen/io/abinit/pseudos.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pymatgen/io/abinit/pseudos.py b/pymatgen/io/abinit/pseudos.py index c8dca6dcc93..7dd1a3d4244 100644 --- a/pymatgen/io/abinit/pseudos.py +++ b/pymatgen/io/abinit/pseudos.py @@ -53,22 +53,14 @@ # Tools and helper functions. -<<<<<<< HEAD -def straceback() -> str: - """Get a string with the traceback.""" +#def straceback() -> str: +# """Get a string with the traceback.""" +# +# return "\n".join((traceback.format_exc(), str(sys.exc_info()[0]))) - return "\n".join((traceback.format_exc(), str(sys.exc_info()[0]))) - -def _read_nlines(filename: str, n_lines: int) -> list[str]: - """ - Read at most n_lines lines from file filename. - If n_lines is < 0, the entire file is read. - """ -======= def _read_nlines(filename: str, n_lines: int) -> list[str]: """Read at most nlines from filename. If nlines is < 0, the entire file is read.""" ->>>>>>> trunk/master if n_lines < 0: with open(filename, encoding="utf-8") as file: return file.readlines()