From 98d2e27f34dadc42dc3999a75e7a2370ed55b82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Wagner?= Date: Mon, 11 Jul 2016 15:10:16 +0200 Subject: [PATCH] Fix link for "Virtual AGC" in README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index dd4f0f5..bb7355a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Apollo-11 ========= +<<<<<<< 34ab5315618341565afd71f598cf8458153f738c <<<<<<< f53a271c134f4e473a2eab982bb727bcec7f2dcb <<<<<<< 8192348ca498d3d22677e6a19a05a1985d6e300d Original Apollo 11 guidance computer (AGC) source code, converted from their custom .agc files to .s files for syntax highlighting, for Command Module (Comanche055) and Lunar Module (Luminary099). Digitized by the folks at [Virtual AGC](http://www.ibiblio.org/apollo/) and [MIT Museum](http://web.mit.edu/museum/). The goal is to be a repo for the original Apollo 11 source code. As such, PRs are welcome for any issues identified between the transcriptions in this repository and the original source scans for [Luminary 099](http://www.ibiblio.org/apollo/ScansForConversion/Luminary099/) and [Comanche 055](http://www.ibiblio.org/apollo/ScansForConversion/Comanche055/), as well as any files I may have missed. @@ -10,6 +11,9 @@ Original Apollo 11 guidance computer (AGC) source code, converted from their cus ======= Original Apollo 11 guidance computer (AGC) source code, converted from their custom .agc files to .s files for syntax highlighting, for Command Module (Comanche055) and Lunar Module (Luminary099). Digitized by the folks at [Virtual AGC](http://www.ibiblio.org/apollo/) and [MIT Museum](http://web.mit.edu/museum/). The goal is to be a repo for the original Apollo 11 source code. As such, PRs are welcome for any issues identified between the transcriptions in this repository and the original source scans for [Luminary 099](http://www.ibiblio.org/apollo/ScansForConversion/Luminary099/) and [Comanche 055](http://www.ibiblio.org/apollo/ScansForConversion/Comanche055/), as well as any files I may have missed. >>>>>>> Point README links to source scans at the scans +======= +Original Apollo 11 guidance computer (AGC) source code, converted from their custom .agc files to .s files for syntax highlighting, for Command Module (Comanche055) and Lunar Module (Luminary099). Digitized by the folks at [Virtual AGC](http://www.ibiblio.org/apollo/) and [MIT Museum](http://web.mit.edu/museum/). The goal is to be a repo for the original Apollo 11 source code. As such, PRs are welcome for any issues identified between the transcriptions in this repository and the original source scans for [Luminary](http://www.ibiblio.org/apollo/listings/Luminary099/) and [Comanche](http://www.ibiblio.org/apollo/listings/Comanche055/), as well as any files I may have missed. +>>>>>>> Fix link for "Virtual AGC" in README ####Attribution