summaryrefslogtreecommitdiff
path: root/.git.info.exclude.in
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2015-02-16 11:52:42 -0500
committerLuke Shumaker <shumakl@purdue.edu>2015-02-16 11:52:42 -0500
commit739fa0ff2b7b0581b2d294f8de8b9e79234ed66c (patch)
tree654bda35871bf30bdedc7b8e252c474f2c0f143e /.git.info.exclude.in
parent7a2dd3a7e3f465141c90abedcb814f9ee9712edd (diff)
Fix merge issues
Diffstat (limited to '.git.info.exclude.in')
-rw-r--r--.git.info.exclude.in5
1 files changed, 0 insertions, 5 deletions
diff --git a/.git.info.exclude.in b/.git.info.exclude.in
index 44bcbd3..2d09032 100644
--- a/.git.info.exclude.in
+++ b/.git.info.exclude.in
@@ -45,8 +45,3 @@ lock
*~
.#*
\#*#
-/.prefix*/
-/.local/share/gvfs-metadata/
-/.local/share/Trash/
-/.config/chromium/
-/.config/dconf/