fix conflict (doc/workflow/groups.md)

d918e2a9 · Marcia Ramos · 88632c97 · d918e2a9
Commit d918e2a9 authored Jul 17, 2017 by Marcia Ramos
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/workflow/groups.md doc/workflow/groups.md +0 -3

No files found.
--- a/doc/workflow/groups.md
+++ b/doc/workflow/groups.md
-<<<<<<< HEAD
-=======

->>>>>>> ce-com/master
 This document was moved to [another location](../user/group/index.md).