From: Alexander Ebert Date: Sat, 5 Apr 2014 23:38:44 +0000 (+0200) Subject: Prevent conflicts with minified JS during merges X-Git-Tag: 2.0.5~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c3ceb5b76c5927ad4d739b6202bd594861d05493;p=GitHub%2FWoltLab%2FWCF.git Prevent conflicts with minified JS during merges --- 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