Commit 514104c8 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FIX] Grouping of ngrams

parent f71cdadf
...@@ -5,7 +5,7 @@ cabal-version: 1.12 ...@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: gargantext name: gargantext
version: 0.0.6.8.5.5 version: 0.0.6.8.5.5
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -211,9 +211,9 @@ ngramsStatePatchConflictResolution ...@@ -211,9 +211,9 @@ ngramsStatePatchConflictResolution
-> NgramsTerm -> NgramsTerm
-> ConflictResolutionNgramsPatch -> ConflictResolutionNgramsPatch
ngramsStatePatchConflictResolution _ngramsType _ngramsTerm ngramsStatePatchConflictResolution _ngramsType _ngramsTerm
-- = (ours, (const ours, ours), (False, False)) = (ours, (const ours, ours), (False, False))
-- (False, False) mean here that Mod has always priority. -- (False, False) mean here that Mod has always priority.
= (ours, (const ours, ours), (True, False)) -- = (ours, (const ours, ours), (True, False))
-- (True, False) <- would mean priority to the left (same as ours). -- (True, False) <- would mean priority to the left (same as ours).
-- undefined {- TODO think this through -}, listTypeConflictResolution) -- undefined {- TODO think this through -}, listTypeConflictResolution)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment