resolve conflicts on JSON

Browse Source

...

This commit is contained in:

Dave Machado authored and GitHub committed 2017-08-05 21:48:43 -04:00

1 parent 27f14330fb

commit 1ac92f2dfc

1 file changed

-2500

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

Download Patch File Download Diff File Expand all files Collapse all files

json/entries.json

-2500

File diff suppressed because it is too large. Load diff