2023-02-20 10:12:20 +00:00
1 changed files with 0 additions and 1 deletions
--- 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)