Resolve merge conflicts

remotes/1678337322733154087/tmp_refs/heads/master
Jonas Franz 5 years ago
parent 0a36aa3d6e
commit 35b70fe3d0
  1. 13
      bot.go

@ -15,18 +15,6 @@ import (
var ( var (
canteen *openmensa.Canteen canteen *openmensa.Canteen
<<<<<<< HEAD
emojis = map[string][]string{
":pizza:": {"pizza"},
":hotdog:": {"wurst"},
":fries:": {"pommes"},
":hamburger:": {"burger"},
":fish:": {"lachs", "filet", "fisch", "kabeljau"},
":apple:": {"apfel", "äpfel"},
":poultry_leg:": {"hänchen"},
":meat_on_bone:": {"schnitzel"},
":spaghetti:": {"nudel", "spaghetti", "pasta"},
=======
emojis = map[string][]string { emojis = map[string][]string {
":pizza:": {"pizza"}, ":pizza:": {"pizza"},
":hotdog:": {"wurst", "würstchen", "hotdog"}, ":hotdog:": {"wurst", "würstchen", "hotdog"},
@ -39,7 +27,6 @@ var (
":spaghetti:": {"nudel", "spaghetti", "pasta"}, ":spaghetti:": {"nudel", "spaghetti", "pasta"},
":bread:": {"brot", "brötchen"}, ":bread:": {"brot", "brötchen"},
":rice:": {"reis"} ":rice:": {"reis"}
>>>>>>> ccc765c03c0d2197ea832ae11f6f8795cdf7ac6b
} }
) )

Loading…
Cancel
Save