diff options
| author | Jeffrey Feng | 2018-05-23 01:42:53 +0800 |
|---|---|---|
| committer | Jeffrey Feng | 2018-05-23 01:42:53 +0800 |
| commit | f89941366fa422d208652f200d6b054938932d7f (patch) | |
| tree | 023b9d060338a2a1d4847a1f1f587672aca31381 | |
| parent | 4f7c8e2b60ceee296a6da0d960d05fd339f210d8 (diff) | |
| parent | a36badcae9e5ab9462d47d5dc3d0948befc8f382 (diff) | |
| download | aur-f89941366fa422d208652f200d6b054938932d7f.tar.gz | |
Merge .gitignore
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 34ed9f3da2cd..6b23cdd2199b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ /evince +<<<<<<< HEAD /pkg /src +======= +/src +/pkg +>>>>>>> a36badcae9e5ab9462d47d5dc3d0948befc8f382 *.tar.xz |