Commits

History for

Commits on Jan 25, 2021

tools: Attempt to resolve package-lock merge conflicts more seamlessly (#1300)
castastrophe
authored
1c9b557

Commits on Nov 25, 2020

feat: Rename theme to context (#996)

authored
117a0e7

Commits on Jan 10, 2019

prevent diff/conflicts in esm map files and theme js files
mwcz
committed
161938b

Commits on Jan 7, 2019

apply binary merge resolution to all compiled files
mwcz
committed
0db49b8

Commits on Oct 31, 2018

prevent package-lock diffs (#232)

mwcz
authored and
kylebuch8
committed
fd2b033

Commits on Sep 19, 2018

skip diff and merging on *.umd.js files (#168)

mwcz
authored and
kylebuch8
committed
53bcda4

Loading