From 56329c11ff2a328d3647518daa3236ba2146173f Mon Sep 17 00:00:00 2001
From: Michael Clayton <mclayton@redhat.com>
Date: Tue, 18 Sep 2018 16:23:18 -0400
Subject: [PATCH] skip diff and merging on *.umd.js files

---
 .gitattributes | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..4c92aac46b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+elements/*/*.umd.js     -diff -merge
+elements/*/*.umd.js.map -diff -merge
+themes/*/*.umd.js       -diff -merge
+themes/*/*.umd.js.map   -diff -merge