summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitattributes12
-rw-r--r--archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar2
2 files changed, 12 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 6b3097ade..ed5a6a78e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,11 @@
-*.jar binary \ No newline at end of file
+*.jar binary
+
+# Auto detect text files and perform LF normalization
+* text=auto
+
+*.java text diff=java
+*.html text diff=html
+*.xml text diff=xml
+*.css text
+*.js text
+*.sql text \ No newline at end of file
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
index 0bf178413..df51eddb4 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
@@ -1,2 +1,2 @@
-get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
(proxied 1) \ No newline at end of file