2 Commits

Author	SHA1	Message	Date
Enno Boland	a4e76983e3	.gitattributes: Set merge union merge driver for common/shlibs ... This will reduce merge conflicts for common/shlibs.	2016-01-07 10:53:04 +01:00
Juan RP	579cf11b17	srcpkgs/.gitattributes -> .gitattributes	2015-04-07 12:17:25 +02:00