From cd74ba98cd9ba75b02a13c399c8a705e453e7541 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 22 Jun 2018 11:15:55 -0700
Subject: [PATCH] merge typo

---
 src/runtime/runtime.pkg | 1 -
 1 file changed, 1 deletion(-)

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")
-- 
2.25.1