git pull

hi list,

Somehow when I do a pull to update the kernel archive i get:

Auto-merging rsbac/data_structures/aci_ata_structures.c
CONFLICT (add/add): Merge conflict in 
rsbac/data_structures/aci_data_structures.c
Automatic merge failed; fix conflicts and then commit the result.

Its not the first time that update the master branch failed.

-- 
Mit freundlichen Grüßen

Jens Kasten


http://www.kasten-edv.de
E-bikes: http://www.remsdale.de
_______________________________________________
rsbac mailing list
[email protected]
http://www.rsbac.org/mailman/listinfo/rsbac