modified: .gitignore

Thinstation · Nov 19, 2018 · 40cbe02 · 40cbe02
1 parent aab46f1
commit 40cbe02
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,6 @@
 autodl
 /build
 /usr
-<<<<<<< HEAD
-/usr/ROX/
-/usr/bin/
-/usr/etc/
-/usr/include/
-/usr/lib/
-/usr/lib64
-/usr/libexec/
-/usr/local/
-/usr/man/
-/usr/sbin/
-/usr/share/
-/usr/src/
-/usr/var
-/man/
-/var/
-/www/
-/.project
-=======
 /lib64
 /run
 /www
@@ -41,4 +22,3 @@ autodl
 /var
 /ts/components
 /downloads
->>>>>>> 6.1-Stable