Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2016-02-26 10:35:38 -0500
committerBenoit Maggi2016-02-26 10:35:38 -0500
commiteebdd17c762211ebcf417844cd21432d4ba3df34 (patch)
tree2c6940288d0e6d334626d1b4224cd254d002d3dd /.gitattributes
parente5da63b0a93f43fb74054dde53b31cc817d571e4 (diff)
downloadorg.eclipse.papyrus-eebdd17c762211ebcf417844cd21432d4ba3df34.tar.gz
org.eclipse.papyrus-eebdd17c762211ebcf417844cd21432d4ba3df34.tar.xz
org.eclipse.papyrus-eebdd17c762211ebcf417844cd21432d4ba3df34.zip
Bug 486996 - Add .gitattributes to avoid EOL conflict
- remove .gitattributes Change-Id: I994093feba9674dd9d2244bd80d3ebce61419ab3 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to '.gitattributes')
-rwxr-xr-x.gitattributes82
1 files changed, 0 insertions, 82 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100755
index 16c79c5720c..00000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,82 +0,0 @@
-# Handle line endings automatically for files detected as text
-# and leave all files detected as binary untouched.
-* text=auto
-
-#
-# The above will handle all files NOT found below
-#
-# These files are text and should be normalized (Convert crlf => lf)
-*.assistants text
-*.classpath text
-*.configuration text
-*.creationmenumodel text
-*.css text
-*.csv text
-*.ctx text
-*.df text
-*.di text
-*.ecore text
-*.efx text
-*.elementtypesconfigurations text
-*.emx text
-*.epx text
-*.expansionmodel text
-*.exsd text
-*.extendedtypes text
-*.fml text
-*.genmodel text
-*.gmfgen text
-*.htm text
-*.html text
-*.idgen text
-*.ini text
-*.java text
-*.js text
-*.json text
-*.jsp text
-*.jspf text
-*.LICENSE text
-*.md text
-*.mediawiki text
-*.MF text
-*.mwe2 text
-*.nattableconfiguration text
-*.notation text
-*.paletteconfiguration text
-*.prefs text
-*.product text
-*.project text
-*.properties text
-*.py text
-*.sh text
-*.suite text
-*.svg text
-*.test text
-*.tld text
-*.tsv text
-*.txt text
-*.uml text
-*.xmi text
-*.xml text
-*.xsd text
-*.xtext text
-*.xwt text
-
-# These files are binary and should be left untouched
-# (binary is a macro for -text -diff)
-*.bmp binary
-*.class binary
-*.dll binary
-*.dylib binary
-*.ear binary
-*.gif binary
-*.ico binary
-*.icns binary
-*.jar binary
-*.jpg binary
-*.jpeg binary
-*.pdf binary
-*.png binary
-*.so binary
-*.war binary
-*.zip binary

Back to the top