docs: clean up readme

hyoklee · Mar 1, 2024 · f59aa1b · f59aa1b
1 parent aabfa38
commit f59aa1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml
@@ -37,6 +37,6 @@ jobs:
             sudo pkg_add jpeg
             mkdir build
             cd build
-            cmake ..
+            cmake -DHDF4_BUILD_FORTRAN:BOOL=OFF ..
             make
             make test
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -24,7 +24,7 @@ jobs:
         uses: cross-platform-actions/[email protected]
         env:
           FOO: A
-          BAR: B        
+          BAR: B
         with:
           environment_variables: FOO BAR
           operating_system: ${{ matrix.os.name }}
@@ -37,6 +37,6 @@ jobs:
             sudo pkg_add jpeg
             mkdir build
             cd build
-            cmake  ..
+            cmake -DHDF4_BUILD_FORTRAN:BOOL=OFF ..
             make
             make test
diff --git a/README.md b/README.md
@@ -9,11 +9,5 @@
 
 [![amd64 clang/gcc Autotools/CMake](https://github.com/hyoklee/h4/actions/workflows/main.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/main.yml)
 
-<<<<<<< HEAD
 [![amd64](https://github.com/hyoklee/h4/actions/workflows/openbsd.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/r.yml)
 [![arm64](https://github.com/hyoklee/h4/actions/workflows/openbsd_arm64.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/arm64.yml)
-=======
-[![amd64 OpenBSD 7.2 CMake](https://github.com/hyoklee/h4/actions/workflows/openbsd.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/openbsd.yml)
-[![arm64 OpenBSD 7.2 CMake](https://github.com/hyoklee/h4/actions/workflows/openbsd_arm64.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/openbsd_arm64.yml)
->>>>>>> ff5e551f3bb2a9c1c0d7b12d697a53a5eff04ef0
-