From 9b0f76d87d6288943844c2ba45f76318a2335646 Mon Sep 17 00:00:00 2001 From: helgabutters Date: Tue, 13 Feb 2018 17:45:39 -0500 Subject: [PATCH] fix(update-readme): fix merge --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index a31bb5bd..51462c5e 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,7 @@ Zap is a free Lightning Network wallet focused on user experience and ease of us The UI for Zap is created using [Electron](https://electron.atom.io/) + [React](https://facebook.github.io/react/) + [Redux](https://github.com/reactjs/redux/tree/master/docs). -<<<<<<< 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 @@ -71,14 +67,9 @@ zap-desktop Once you have the .AppImage file extracted, you can either **double click** the file or by running in the cli: -<<<<<<< HEAD ```bash ./file.AppImage ``` -======= -## Todos: -Join us on [slack](https://join.slack.com/t/zaphq/shared_invite/enQtMzA4OTgxNTQ4NzUzLTQwYjkzZGM0ZWMwYmYyZTE2Y2E1YjM5NTIwOTU0M2I1Zjc2YWY1NTc4NjdhZWQxNTM1YzEzOGM2YTVlNWIwODc) before tackling a todo to avoid duplicate work. ->>>>>>> upstream/master ## Advanced Usage If you would like to install from source or run a full bitcoin node, please see the [advanced usage](https://github.com/LN-Zap/zap-desktop/blob/master/ADVANCED.md) page.