From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 22 Jun 2018 18:15:55 +0000 (-0700)
Subject: merge typo
X-Git-Tag: mit-scheme-pucked-9.2.15~9
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=cd74ba98cd9ba75b02a13c399c8a705e453e7541;p=mit-scheme.git

merge typo
---

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index e9f988626..fd41a9c58 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -4367,7 +4367,6 @@ USA.
 	  x-visual-info/screen
 	  x-visual-info/visual
 	  x-visual-info/visual-id))
->>>>>>> 38a01aac203925429e4a26afee8dd33110349cc0
 
 (define-package (runtime state-space)
   (files "wind")