Merge pull request #17 from defaultxr/patch-1
remove git merge conflict marker
This commit is contained in:
commit
9f0a9d3da3
1 changed files with 0 additions and 1 deletions
1
osc.lisp
1
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)
|
||||
|
|
Loading…
Reference in a new issue