prevent diff/conflicts in esm map files and theme js files

patternfly · Jan 10, 2019 · 161938b · 161938b
1 parent 5647715
commit 161938b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,12 @@
+package-lock.json            -diff -merge
+
 elements/*/*.js              -diff -merge
+elements/*/*.js.map          -diff -merge
 elements/*/gulpfile.js       diff merge
 elements/*/rollup.config.js  diff merge
 elements/*/*.story.js        diff merge
 
-elements/*/*.umd.js          -diff -merge
-elements/*/*.umd.js.map      -diff -merge
-themes/*/*.umd.js            -diff -merge
-themes/*/*.umd.js.map        -diff -merge
-package-lock.json            -diff -merge
+themes/*/*.js                -diff -merge
+themes/*/*.js.map            -diff -merge
+themes/*/gulpfile.js         diff merge
+themes/*/rollup.config.js    diff merge