From 60e1f029fb7c9b955a3a48d4352f489679873a41 Mon Sep 17 00:00:00 2001 From: helgabutters Date: Tue, 13 Feb 2018 17:41:25 -0500 Subject: [PATCH] fix(merge): fix merge issue --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5f1d51d8..a31bb5bd 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ The UI for Zap is created using <<<<<<< HEAD We have an active [slack](https://join.slack.com/t/zaphq/shared_invite/enQtMjkyNTAxNDA3MjE2LWE3NGZjZGE5ZmI1NGQ5YTk3MGQzMTdmNDAwYjNhZTJkMWU0ZWZlNzA0MjJiNDBjMzcxYjcyMDMxNWY3OGNhYWQ) channel where you can join the discussion on development, design and product. ======= +Join us on [slack](https://join.slack.com/t/zaphq/shared_invite/enQtMzA4OTgxNTQ4NzUzLTQwYjkzZGM0ZWMwYmYyZTE2Y2E1YjM5NTIwOTU0M2I1Zjc2YWY1NTc4NjdhZWQxNTM1YzEzOGM2YTVlNWIwODc) to discuss development, design and product >>>>>>> upstream/master ## Installing