resolve conflict

Tencent · Oct 23, 2019 · 00549ce · 00549ce
2 parents 2f75149 + dd6ee7c
commit 00549ce
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/dist/example/form/form.json b/dist/example/form/form.json