projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31af1cb)
Prevent conflicts with minified JS during merges
authorAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:39:59 +0000 (01:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:39:59 +0000 (01:39 +0200)
wcfsetup/install/files/js/.gitattributes [new file with mode: 0644] patch | blob

diff --git a/wcfsetup/install/files/js/.gitattributes b/wcfsetup/install/files/js/.gitattributes
new file mode 100644 (file)
index 0000000..dd55300
--- /dev/null
+++ b/wcfsetup/install/files/js/.gitattributes
@@ -0,0 +1 @@
+*.min.js merge=ours
\ No newline at end of file
WoltLab Suite Core (previously WoltLab Community Framework)