From c3ceb5b76c5927ad4d739b6202bd594861d05493 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 6 Apr 2014 01:38:44 +0200 Subject: [PATCH] Prevent conflicts with minified JS during merges --- wcfsetup/install/files/js/.gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 wcfsetup/install/files/js/.gitattributes diff --git a/wcfsetup/install/files/js/.gitattributes b/wcfsetup/install/files/js/.gitattributes new file mode 100644 index 0000000000..dd553003b5 --- /dev/null +++ b/wcfsetup/install/files/js/.gitattributes @@ -0,0 +1 @@ +*.min.js merge=ours \ No newline at end of file -- 2.20.1