upstream

Ellen Arteca · Ellen Arteca · commit 7d0ad069a8d7 · 2022-07-21T21:38:09.000Z
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,5 @@ tex/*/out
 perf.data
 perf.data.old
 flamegraph.svg
-<<<<<<< HEAD
 tests/extern-so/libtestlib.so
 .auto-*
