From bbe97a37fb2ed9e76fa007bcd7f525bc0bd436ec Mon Sep 17 00:00:00 2001 From: webworker01 Date: Tue, 27 Mar 2018 15:38:36 -0400 Subject: [PATCH] Fix conflicts --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index e5f69ee..376f785 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,7 @@ Data is coming soon - everything is hand crafted and manually verified. Please, | peer2cloud | [proposal](./proposals/peer2cloud) | **SH** **AR** | | + | | polycryptoblog | [proposal](./proposals/polycryptoblog) | **SH** **AR** | **NA** | + | | pondsea | [proposal](./proposals/pondsea) | **SH** **EU** | **AR** **NA** | + | -<<<<<<< HEAD | popcornbag | [proposal](./proposals/popcornbag) | **SH** **EU** | | + | -======= -| popcornbag | [proposal](./proposals/popcornbag) | **EU** **SH** | | + | ->>>>>>> 78086807170bfe0356e6831439becdd5c82228ed | ptyx | [proposal](./proposals/ptyx) | **SH** **AR** **NA** **EU** | | + | | rnr | [proposal](./proposals/rnr) | **AR** **NA** | **SH** **EU** | + | | shossain | [proposal](./proposals/shossain) | **EU** **AR** | | + |