From 37eb9f681a93e5ef4a1206a5f573981f35ac8fb1 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sat, 20 Nov 2021 10:10:14 -0800 Subject: [PATCH] minor support to manage profile servers --- features/groups/group_functionality.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/features/groups/group_functionality.go b/features/groups/group_functionality.go index 77be796..d4e3089 100644 --- a/features/groups/group_functionality.go +++ b/features/groups/group_functionality.go @@ -10,6 +10,15 @@ import ( "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" "git.openprivacy.ca/cwtch.im/libcwtch-go/features/servers" ) +<<<<<<< HEAD +"git.openprivacy.ca/cwtch.im/libcwtch-go/features/servers" +======= +"git.openprivacy.ca/cwtch.im/libcwtch-go/features" +"git.openprivacy.ca/cwtch.im/libcwtch-go/features/servers" +"git.openprivacy.ca/openprivacy/log" +"strings" +>>>>>>> minor support to manage profile servers +) const groupExperiment = "tapir-groups-experiment"