Fix merge.

2 years ago · ece8884d12
parent 74befae757
commit ece8884d12
1 changed files with 0 additions and 3 deletions
--- a/main.go
+++ b/main.go
@ -81,10 +81,7 @@ func main() {
 		message, user, server, password, resource, alias string
 		oxPrivKey                                        *crypto.Key
 		recipients                                       []recipientsType
-<<<<<<< HEAD
 		groupchat                                        bool
-=======
->>>>>>> master
 	)

 	// Define command line flags.