aboutsummarylogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorfusion8092016-06-11 00:58:27 +1000
committerfusion8092016-06-11 00:58:27 +1000
commit9cb0019b38722d4715965a5f86cf57fad525d570 (patch)
treeed05aeed69b7207bc65da91fbacec69cf399c246 /.gitignore
parent96236054f6612a6e8ec049a5d2f92b59ad1b6ec7 (diff)
downloadaur-9cb0019b38722d4715965a5f86cf57fad525d570.tar.gz
Updating
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore43
1 files changed, 42 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a918cdfc66ab..2585b90ab1ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,48 @@
+<<<<<<< HEAD
+.vscode
+*.7z
+*.zip
+*.rar
+*.tar
+*.tar*
+*.xz
+*.sign
+*.part
src
pkg
-*.xz
+moksha-modules-extra
+Moksha*
+vim
+vim-pathogen
+vundle-git/vundle-git
+atom/
+*.ebuild
*.deb
*.rpm
+Shadow
+*/vscode
+*/*/vscode
+node_modules
+browser-plus*
+language-rpm-spec
+linter
+*build.log*
+*prepare.log*
+*package.log*
+*.xz
*.gz
*.log*
+about*
+dark-bint-syntax
+fusion-ui
+language-archlinux
+language-gfm2
+language-ini-desktop
+language-liquid
+language-patch2
+language-shellscript
+mydict
+language-*
+terminal-*
+*-terminal
+atom-*