修改合并冲突

95b17105 · liang ce · 8cae1d78 · 95b17105
Commit 95b17105 authored Feb 25, 2020 by liang ce
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

app.json app.json +1 -0

No files found.
--- a/app.json
+++ b/app.json
@@ -3,6 +3,7 @@
    "pages/index/index",
    "pages/uploadFile/uploadFile",
    "pages/repetitionTime/repetitionTime",
+    "pages/createOrEditSchedule/createOrEditSchedule",
    "pages/repeatMechanism/repeatMechanism",
    "pages/attendingSituation/attendingSituation",
    "pages/addRemark/addRemark",