freecad/.gitignore

*
!.gitignore
!PKGBUILD
!.SRCINFO
!*.install
!ChangeLog
!*.diff
!*.patch
<<<<<<< HEAD
!*.desktop
!*.xml
Add gitignore 2017-05-19 11:54:10 +02:00			`*`
			`!.gitignore`
			`!PKGBUILD`
			`!.SRCINFO`
			`!*.install`
			`!ChangeLog`
			`!*.diff`
			`!*.patch`
Merge branch 'master' of ssh://aur.archlinux.org/freecad-git 2017-05-19 11:56:39 +02:00			`<<<<<<< HEAD`
Add gitignore 2017-05-19 11:54:10 +02:00			`!*.desktop`
			`!*.xml`