resolve conflicts on minified JSON

Browse source

...

This commit is contained in:

Dave Machado 2017-08-05 21:48:24 -04:00 • committed by GitHub

parent 3ae648eb29

commit 27f14330fb

1 changed files with 0 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

1

json/entries.min.json

View file

File diff suppressed because one or more lines are too long