[FIX] merge conflicts

bcb77a73 · Alexandre Delanoë · 9273840a · f777d222 · bcb77a73 · bcb77a73
Commit bcb77a73 authored Sep 23, 2024 by Alexandre Delanoë
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

update-project-dependencies bin/update-project-dependencies +1 -1

cabal.project.local_toCopy cabal.project.local_toCopy +1 -1

No files found.
--- a/bin/update-project-dependencies
+++ b/bin/update-project-dependencies
@@ -18,7 +18,7 @@ fi
 # with the `sha256sum` result calculated on the `cabal.project` and
 # `cabal.project.freeze`. This ensures the files stay deterministic so that CI
 # cache can kick in.
-expected_cabal_project_hash="967fee2ed28f46b12a629ad9821301854d3159975b7297653e50d7fc1f3b8919"
+expected_cabal_project_hash="3943da8b9f3ae918afadf2b302875b3b395b31b2f69c3d42135af2ac800b7a0c"
 expected_cabal_project_freeze_hash="af825192f1ec47b07e6001dd2556b59991c9e6c50094dc732ee933a41f0dc9bd"



--- a/cabal.project.local_toCopy
+++ b/cabal.project.local_toCopy
 package gargantext
-    ghc-options: -fwrite-ide-info -O0
+    ghc-options: -fwrite-ide-info

 package gargantext-admin
    ghc-options: -O0