zzkt/osc
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Activity Actions

Merge pull request #17 from defaultxr/patch-1

Browse source 
remove git merge conflict marker
This commit is contained in:
nik gaffney 2023-02-20 11:12:19 +01:00 committed by GitHub
commit 9f0a9d3da3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
osc.lisp
View file

@ -425,7 +425,6 @@ with the current time use (encode-timetag :time)."
"encodes a blob from a given vector" "encodes a blob from a given vector"
(let ((bl (length blob))) (let ((bl (length blob)))
(cat (encode-int32 bl) blob (cat (encode-int32 bl) blob
<<<<<<< HEAD
(pad (padding-length bl))))) (pad (padding-length bl)))))
(defun decode-blob (blob) (defun decode-blob (blob)