resolved conflicts

lbl-srg · Sep 12, 2023 · 7af15ae · 7af15ae
1 parent ca53269
commit 7af15ae
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -12,13 +12,8 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< HEAD
-        os: [ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.8']
-=======
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.8', '3.9']
->>>>>>> master
 
     steps:
       - uses: actions/checkout@v3

diff --git a/src/compare.h b/src/compare.h
@@ -16,16 +16,6 @@
 #define MAX 100
 
 /*
-<<<<<<< HEAD
-*   Descriptor of the file used for logging the numerical processing errors
-*   (all other errors like memory, file access, bad argument...
-*   are still output to stderr.)
-*/
-extern FILE *log_file;
-
-/*
-=======
->>>>>>> master
  * Function: compareAndReport
  * -----------------------
  *   This function does the actual computations. It is introduced so that it