Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into gh-pages

Browse source 
# Conflicts:
#	apps/README.md
#	disks/pcx86/README.md
This commit is contained in:
Jeff Parsons 2017-06-22 12:14:10 -07:00 • committed by Jeff Parsons
commit 0b6dd6059c
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/README.md
View file

@ -1,11 +1,8 @@
--- ---
layout: page layout: page
title: Software Archives title: Software Archives
<<<<<<< HEAD
=======
menu_title: Apps menu_title: Apps
menu_order: 2 menu_order: 2
>>>>>>> master
permalink: /apps/ permalink: /apps/
--- ---