merge

eldr-io · Dec 1, 2023 · 8d95851 · 8d95851
2 parents baaae59 + 8244a99
commit 8d95851
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 ![Haskell](https://img.shields.io/badge/Haskell-5e5086?style=for-the-badge&logo=haskell&logoColor=white) [![Haskell CI](https://github.com/eldr-io/audiocate/actions/workflows/haskell.yml/badge.svg)](https://github.com/eldr-io/audiocate/actions/workflows/haskell.yml)
 
 Audio encoding authentication library for verifying audio as being from a trusted source
+<<<<<<< HEAD
 
 ### How to
 #### Compile all
@@ -24,3 +25,5 @@ Run benchmarks with pattern:
 cabal run bench -- -p "stream" --svg test/output/bench_results.svg --csv test/output/bench_results.csv +RTS -T
 
 ```
+=======
+>>>>>>> 8244a99d71da7824a5be91363fbde2b181e8cf4d
diff --git a/test/corpus/harvard.wav b/test/corpus/harvard.wav
diff --git a/test/corpus/harvard_mono.wav b/test/corpus/harvard_mono.wav
diff --git a/test/corpus/sample1_spec.png b/test/corpus/sample1_spec.png
diff --git a/test/corpus/sample1_spectrogram_1.png b/test/corpus/sample1_spectrogram_1.png