From 7af15aefc56e4951db33ff28c4094379e7d55b27 Mon Sep 17 00:00:00 2001
From: jayhulbl <jianjunhu@lbl.gov>
Date: Tue, 12 Sep 2023 16:23:18 -0700
Subject: [PATCH] resolved conflicts

---
 .github/workflows/cmake.yml |  5 -----
 src/compare.h               | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index ca8e51ea..333d7123 100644
--- 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
index 5fc21ae4..ee7f9e43 100644
--- 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