Changeset bbbe1e1 in flex_extract.git

Timestamp:

Jul 9, 2020, 8:49:47 AM (4 years ago)

Author:

anphi <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

0a75335

Parents:

a20f0de

Message:

solved a failed merge

File:

• Source/Python/install.py (modified) (3 diffs)

Source/Python/install.py

@@ -515 +515 @@
     ----------
     makefile : str
-<<<<<<< HEAD
-        Name of the makefile which should be used to compile FORTRAN
-=======
         Name of the makefile which should be used to compile the Fortran
->>>>>>> origin/task/language-editing
         program.
 
@@ -709 +705 @@
             print('Please edit ' + makefile +
                   ' or try another makefile in the src directory.')
-<<<<<<< HEAD
             print('Most likely ECCODES_INCLUDE_DIR, ECCODES_LIB '
-=======
-            print('Most likely GRIB_API_INCLUDE_DIR, GRIB_API_LIB '
->>>>>>> origin/task/language-editing
                   'and EMOSLIB must be adapted.')
             print('Available makefiles:')
@@ -719 +711 @@
             sys.exit('Compilation failed!')
     except ValueError as e:
-<<<<<<< HEAD
         print('ERROR: makefile call failed:')
-=======
-        print('ERROR: make of Fortran code failed:')
->>>>>>> origin/task/language-editing
         print(e)
     else: