From 0b6dd6059ca6dd24ed1dd6ce0706f44363ed5bbd Mon Sep 17 00:00:00 2001
From: Jeff Parsons <jeff@pcjs.org>
Date: Thu, 22 Jun 2017 12:14:10 -0700
Subject: [PATCH] Merge branch 'master' into gh-pages

# Conflicts:
#	apps/README.md
#	disks/pcx86/README.md
---
 apps/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/README.md b/apps/README.md
index 6e3d10b54..0fbed89ca 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -1,11 +1,8 @@
 ---
 layout: page
 title: Software Archives
-<<<<<<< HEAD
-=======
 menu_title: Apps
 menu_order: 2
->>>>>>> master
 permalink: /apps/
 ---