diff options
| author | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
|---|---|---|
| committer | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
| commit | 07f7eb81e2eb9b28369c83d02a63e77d5ece14bf (patch) | |
| tree | 3d1c50b5f1a7b4ba496fbf189b9d2d3f3fd89de3 /deploy | |
| parent | f8a2744ea03ec03236284939d14787b04b9c8aa6 (diff) | |
| parent | 98dff6ca1915ef006e13532f593219c9bc4ccc97 (diff) | |
merge conflicts resolved
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/mobile/image.html (renamed from deploy/mobile/image_upload.html) | 2 | ||||
| -rw-r--r-- | deploy/mobile/ink.html (renamed from deploy/mobile/ink_controls.html) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/mobile/image_upload.html b/deploy/mobile/image.html index 4cfd931ac..0a5f90d79 100644 --- a/deploy/mobile/image_upload.html +++ b/deploy/mobile/image.html @@ -7,7 +7,7 @@ <body> <div id="root"></div> - <script src="../image_upload.js"></script> + <script src="../imageUpload.js"></script> </body> </html>
\ No newline at end of file diff --git a/deploy/mobile/ink_controls.html b/deploy/mobile/ink.html index 725ed3685..938d85794 100644 --- a/deploy/mobile/ink_controls.html +++ b/deploy/mobile/ink.html @@ -7,7 +7,7 @@ <body> <div id="root"></div> - <script src="../ink_controls.js"></script> + <script src="../inkControls.js"></script> </body> </html>
\ No newline at end of file |