merge-update from trunk

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 3daa4eca1bc10dcdccba0e6b1c2db113629e4e02..8c999ebd74b8d2e2f60688f06021eea5b4b5061e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1231,6 +1231,7 @@ eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate_data-16x16-32.png -tex
 eu.etaxonomy.taxeditor.store/icons/step_done.gif -text
 eu.etaxonomy.taxeditor.store/icons/swap.gif -text
 eu.etaxonomy.taxeditor.store/icons/swap2.gif -text
+eu.etaxonomy.taxeditor.store/icons/switch_view_type-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/synced.gif -text
 eu.etaxonomy.taxeditor.store/icons/system-file-manager.png -text
 eu.etaxonomy.taxeditor.store/icons/system-users.png -text