[FIX] conflict

163304df · Alexandre Delanoë · 82c68074 · 163304df
Commit 163304df authored Oct 08, 2024 by Alexandre Delanoë
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Types.hs src/Gargantext/API/Node/Update/Types.hs +0 -4

No files found.
--- a/src/Gargantext/API/Node/Update/Types.hs
+++ b/src/Gargantext/API/Node/Update/Types.hs
@@ -21,13 +21,9 @@ data UpdateNodeParams = UpdateNodeParamsList  { methodList  :: !Method      }

                      | UpdateNodeParamsTexts { methodTexts :: !Granularity }

-<<<<<<< HEAD
-                      | UpdateNodeParamsCorpus { methodTexts :: !Granularity
-=======
                      | UpdateNodeParamsCorpus { methodGraph :: !UpdateNodeConfigGraph
                                               , methodPhylo :: !PhyloSubConfigAPI
                                               , methodTexts :: !Granularity
->>>>>>> origin/dev-add-nanomsg-to-nix
                                               , methodList  :: !Method }

                      | UpdateNodeParamsBoard { methodBoard :: !Charts      }