merge typo

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index e9f98862677171b76a01aa2b68811d31e0f0f6ba..fd41a9c5878741b703d7b1353c5dacafece22f95 100644 (file)
--- 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")