From 803a330533a9f658c97435776704f8433be94b57 Mon Sep 17 00:00:00 2001
From: modula t <defaultxr@gmail.com>
Date: Sun, 19 Feb 2023 22:25:31 -0600
Subject: [PATCH] remove git merge conflict marker

---
 osc.lisp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osc.lisp b/osc.lisp
index 7034b46..89a5133 100644
--- a/osc.lisp
+++ b/osc.lisp
@@ -425,7 +425,6 @@ with the current time use (encode-timetag :time)."
   "encodes a blob from a given vector"
   (let ((bl (length blob)))
     (cat (encode-int32 bl) blob
-         <<<<<<< HEAD
          (pad (padding-length bl)))))
 
 (defun decode-blob (blob)
-- 
2.39.5