fortrangoingonforty/armfortas / a609494

Browse files

remove conflict marker

Authored by Matthew Forrester Wolffe <137964366+mfwolffe@users.noreply.github.com>
Committed by GitHub
SHA
a6094946b3c0a6e5c0b811ff4401dfa087a4b945
Parents
8e1db6f
Tree
d750039

1 changed file

StatusFile+-
M README.md 1 1
README.mdmodified
@@ -181,7 +181,7 @@ cargo run -p afs-tests -- run --suite runtime # bencch runtime suite
181181
 cargo run -p afs-tests -- run --suite consistency # reproducibility checks
182182
 ```
183183
184
-<<<<<<< HEAD
184
+
185185
 The root `armfortas` harness is the fast, armfortas-first runner. It compiles
186186
 each `.f90` file in `test_programs/`, runs the binary, and evaluates
187187
 source-embedded assertions such as: