diff options
| author | Markus Hovorka | 2017-05-19 11:56:39 +0200 |
|---|---|---|
| committer | Markus Hovorka | 2017-05-19 11:56:39 +0200 |
| commit | dc465119e64f948ae0a669913984325aad7fb59d (patch) | |
| tree | 033c3157bf4ed5b74ebcd078a506023f51037bf9 /.gitignore | |
| parent | d7214cca4037b5f0d790c711f703d556f3463842 (diff) | |
| parent | 69549d556f021e9f6313f6882e133f3ac7e47886 (diff) | |
| download | aur-dc465119e64f948ae0a669913984325aad7fb59d.tar.gz | |
Merge branch 'master' of ssh://aur.archlinux.org/freecad-git
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9ad0e6903b37..e7f545baa552 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ !ChangeLog !*.diff !*.patch +<<<<<<< HEAD !*.desktop !*.xml |