Paste number 322042: conflict

Index of paste annotations: 1

Paste number 322042: conflict
Pasted by: lfam
When:5 years, 4 months ago
Share:Tweet this! | http://paste.lisp.org/+6WHM
Channel:None
Paste contents:
Raw Source | XML | Display As
<<<<<<< HEAD
     (propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0))))
=======
     (propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0))))
>>>>>>> master

Annotations for this paste:

Annotation number 1: conflict in (gnu packages cross-base)
Pasted by: lfam
When:5 years, 4 months ago
Share:Tweet this! | http://paste.lisp.org/+6WHM/1
Paste contents:
Raw Source | Display As
<<<<<<< HEAD
    (propagated-inputs `(("kernel-headers" ,xheaders)))
=======
    (propagated-inputs `(("kernel-headers" ,xlinux-headers)))
>>>>>>> master

Colorize as:
Show Line Numbers

Lisppaste pastes can be made by anyone at any time. Imagine a fearsomely comprehensive disclaimer of liability. Now fear, comprehensively.