Resolved conflicts

index.json

@@ -31,14 +31,6 @@
     "screenshot": "https://github.com/holochain/passthrough-dna/releases/download/v0.0.6/Passthrough.png",
     "description": "This is the simplest hApp possible - and it is meant for testing Holochain itself, interactively. The DNA passes-through the HDK's API functions as zome functions so that hdk::commit_entry and hdk::get_links can be called directly from the UI. If installed with an admin interface it also renders all the internal redux actions that the Holochain instance processes."
   },
-  {
-    "name": "Peer Chat",
-    "directory": "peer-chat",
-    "github": "https://github.com/holochain/peer-chat",
-    "icon": null,
-    "screenshot": "https://raw.githubusercontent.com/holochain/peer-chat/develop/doc/screen.png",
-    "description": "A simple chat app designed to get new users up, running and developing on Holochain"
-  },
   {
     "name": "H wiki",
     "directory": "H-wiki",
@@ -48,7 +40,7 @@
     "description": "The HWiki Project is a site in which users collaboratively modify and structure content directly from a web browser to create a truly distributed knowledge-base"
   },
   {
-    "name": "Acorn",
+    "name": "Acorn (Use Admin!)",
     "directory": "acorn",
     "github": "https://github.com/h-be/acorn-docs",
     "icon": "https://github.com/h-be/acorn-ui/blob/master/dist/logo/acorn-logo-desktop-512px%402x.png",