$ ./webodm.sh update docker-compose -f docker-compose.yml -f docker-compose.nodeodm.yml down --remove-orphans Removing network webodm_default WARNING: Network webodm_default not found. Updating WebODM... git pull origin master From https://github.com/OpenDroneMap/WebODM * branch master -> FETCH_HEAD error: The following untracked working tree files would be overwritten by merge: .babelrc .env .gitignore .gitmodules .pyup.yml .travis.yml CONDUCT.md CONTRIBUTING.md Dockerfile ISSUE_TEMPLATE.md LICENSE.md README.md app/.gitignore app/__init__.py app/admin.py app/api/__init__.py app/api/authentication.py app/api/common.py app/api/presets.py app/api/processingnodes.py app/api/projects.py app/api/tasks.py app/api/urls.py app/apps.py app/boot.py app/contexts/settings.py app/fixtures/gcp.txt app/fixtures/gcp_malformed.txt app/fixtures/orthophoto.tif app/fixtures/tiny_drone_image.jpg app/fixtures/tiny_drone_image_2.jpg app/media/.gitignore app/migrations/.gitignore app/migrations/0001_initial.py app/migrations/0002_task_auto_processing_node.py app/migrations/0003_auto_20170615_1300.py app/migrations/0004_auto_20170707_1014.py app/migrations/0005_auto_20170707_1014.py app/migrations/0006_task_available_assets.py app/migrations/0007_auto_20170712_1319.py app/migrations/0008_preset.py app/migrations/0009_auto_20170721_1332.py app/migrations/0010_auto_20170725_1324.py app/migrations/0011_auto_20171109_1237.py app/migrations/0012_public_task_uuids.py app/migrations/0013_public_task_uuids.py app/migrations/0014_public_task_uuids.py app/migrations/0015_public_task_uuids.py app/migrations/0016_public_task_uuids.py app/migrations/0017_auto_20180219_1446.py app/migrations/0018_auto_20180311_1028.py app/migrations/0019_remove_task_processing_lock.py app/migrations/0020_plugindatum.py app/migrations/0021_auto_20180726_1746.py app/migrations/0022_auto_20181205_1644.py app/migrations/0023_task_running_progress.py app/migrations/0024_update_task_assets.py app/migrations/0025_auto_20190220_1854.py app/migrations/0026_update_images_count.py app/migrations/0027_plugin.py app/migrations/__init__.py app/models/__init__.py app/models/image_upload.py app/models/plugin.py app/models/plugin_datum.py app/models/preset.py app/models/project.py app/models/setting.py app/models/task.py app/models/theme.py app/pending_actions.py app/plugins/__init__.py app/plugins/data_store.py app/plugins/functions.py app/plugins/grass_engine.py app/plugins/menu.py app/plugins/mount_point.py app/plugins/plugin_base.py app/plugins/signals.py app/plugins/templates/base.html app/plugins/templates/form.html app/plugins/templates/webpack.config.js.tmpl app/plugins/views.py app/plugins/worker.py app/scripts/plugin_cleanup.sh app/scripts/resize_gcp.js app/scripts/unlock_all_tasks.py app/signals.py app/static/admin/css/base.css app/static/admin/css/base.css.map app/static/admin/css/base.scss app/static/admin/css/changelists.css app/static/admin/css/dashboard.css app/static/admin/css/fonts.css app/static/admin/css/forms.css app/static/admin/css/forms.css.map app/static/admin/css/forms.scss app/static/admin/css/login.css app/static/admin/css/rtl.css app/static/admin/css/widgets.css app/static/app/.gitignore app/static/app/bundles/.gitignore app/static/app/css/bootstrap.min.css app/static/app/css/font-awesome.min.css app/static/app/css/main.scss app/static/app/css/metisMenu.min.css app/static/app/css/sb-admin-2.css app/static/app/css/theme.scss app/static/app/fonts/FontAwesome.otf app/static/app/fonts/fontawesome-webfont.eot app/static/app/fonts/fontawesome-webfont.svg app/static/app/fonts/fontawesome-webfont.ttf app/static/app/fonts/fontawesome-webfont.woff app/static/app/fonts/fontawesome-webfont.woff2 app/static/app/fonts/glyphicons-halflings-regular.eot app/static/app/fonts/glyphicons-halflings-regular.svg app/static/app/fonts/glyphicons-halflings-regular.ttf app/static/app/fonts/glyphicons-halflings-regular.woff app/static/app/img/404.png app/static/app/img/500.png app/static/app/img/favicon.png app/static/app/img/loading-sm.gif app/static/app/img/loading.gif app/static/app/img/logo512.png app/static/app/js/Console.jsx app/static/app/js/Dashboard.jsx app/static/app/js/MapView.jsx app/static/app/js/ModelView.jsx app/static/app/js/classes/AssetDownloads.js app/static/app/js/classes/Basemaps.js app/static/app/js/classes/Css.js app/static/app/js/classes/Gcp.js app/static/app/js/classes/HistoryNav.js app/static/app/js/classes/PendingActions.js app/static/app/js/classes/PipelineSteps.js app/static/app/js/classes/PresetUtils.js app/static/app/js/classes/ResizeModes.js app/static/app/js/classes/StatusCodes.js app/static/app/js/classes/Storage.js app/static/app/js/classes/TempLayer.js app/static/app/js/classes/Utils.js app/static/app/js/classes/plugins/API.js app/static/app/js/classes/plugins/ApiFactory.js app/static/app/js/classes/plugins/App.js app/static/app/js/classes/plugins/Dashboard.js app/static/app/js/classes/plugins/Map.js app/static/app/js/components/AssetDownloadButtons.jsx app/static/app/js/components/ClipboardInput.jsx app/static/app/js/components/EditPresetDialog.jsx app/static/app/js/components/EditProjectDialog.jsx app/static/app/js/components/EditTaskForm.jsx app/static/app/js/components/EditTaskPanel.jsx app/static/app/js/components/ErrorMessage.jsx app/static/app/js/components/FormDialog.jsx app/static/app/js/components/ImportTaskPanel.jsx app/static/app/js/components/Map.jsx app/static/app/js/components/NewTaskPanel.jsx app/static/app/js/components/Paginated.jsx app/static/app/js/components/Paginator.jsx app/static/app/js/components/ProcessingNodeOption.jsx app/static/app/js/components/ProgressBar.jsx app/static/app/js/components/ProjectList.jsx app/static/app/js/components/ProjectListItem.jsx app/static/app/js/components/ShareButton.jsx app/static/app/js/components/SharePopup.jsx app/static/app/js/components/Standby.jsx app/static/app/js/components/SwitchModeButton.jsx app/static/app/js/components/TaskList.jsx app/static/app/js/components/TaskListItem.jsx app/static/app/js/components/TaskPluginActionButtons.jsx app/static/app/js/components/UploadProgressBar.jsx app/static/app/js/components/tests/AssetDownloadButtons.test.jsx app/static/app/js/components/tests/ClipboardInput.test.jsx app/static/app/js/components/tests/EditPresetDialog.test.jsx app/static/app/js/components/tests/EditProjectDialog.test.jsx app/static/app/js/components/tests/EditTaskForm.test.jsx app/static/app/js/components/tests/EditTaskPanel.test.jsx app/static/app/js/components/tests/ErrorMessage.test.jsx app/static/app/js/components/tests/FormDialog.test.jsx app/static/app/js/components/tests/ImportTaskPanel.test.jsx app/static/app/js/components/tests/Map.test.jsx app/static/app/js/components/tests/NewTaskPanel.test.jsx app/static/app/js/components/tests/Paginated.test.jsx app/static/app/js/components/tests/Paginator.test.jsx app/static/app/js/components/tests/ProcessingNodeOption.test.jsx app/static/app/js/components/tests/ProgressBar.test.jsx app/static/app/js/components/tests/ProjectList.test.jsx app/static/app/js/components/tests/ProjectListItem.test.jsx app/static/app/js/components/tests/ShareButton.test.jsx app/static/app/js/components/tests/SharePopup.test.jsx app/static/app/js/components/tests/Standby.test.jsx app/static/app/js/components/tests/SwitchModeButton.test.jsx app/static/app/js/components/tests/TaskList.test.jsx app/static/app/js/components/tests/TaskListItem.test.jsx app/static/app/js/components/tests/TaskPluginActionButtons.test.jsx app/static/app/js/components/tests/UploadProgressBar.test.jsx app/static/app/js/css/AssetDownloadButtons.scss app/static/app/js/css/ClipboardInput.scss app/static/app/js/css/Console.scss app/static/app/js/css/Dashboard.scss app/static/app/js/css/EditPresetDialog.scss app/static/app/js/css/EditTaskForm.scss app/static/app/js/css/EditTaskPanel.scss app/static/app/js/css/FormDialog.scss app/static/app/js/css/ImportTaskPanel.scss app/static/app/js/css/Map.scss app/static/app/js/css/MapView.scss app/static/app/js/css/ModelView.scss app/static/app/js/css/NewTaskPanel.scss app/static/app/js/css/ProcessingNodeOption.scss app/static/app/js/css/ProjectList.scss app/static/app/js/css/ProjectListItem.scss app/static/app/js/css/ShareButton.scss app/static/app/js/css/SharePopup.scss app/static/app/js/css/Standby.scss app/static/app/js/css/SwitchModeButton.scss app/static/app/js/css/TaskList.scss app/static/app/js/css/TaskListItem.scss app/static/app/js/css/TaskPluginActionButtons.scss app/static/app/js/css/UploadProgressBar.scss app/static/app/js/django/csrf.js app/static/app/js/main.jsx app/static/app/js/plugins/canvas-to-blob.js app/static/app/js/plugins/canvas-to-blob.min.js app/static/app/js/plugins/purify.js app/static/app/js/plugins/purify.min.js app/static/app/js/plugins/sortable.js app/static/app/js/plugins/sortable.min.js app/static/app/js/tests/Console.test.jsx app/static/app/js/tests/Dashboard.test.jsx app/static/app/js/tests/MapView.test.jsx app/static/app/js/tests/mocks/empty.scss.js app/static/app/js/tests/mocks/system.js app/static/app/js/tests/setup/browserMock.js app/static/app/js/tests/setup/setupTests.js app/static/app/js/tests/setup/shims.js app/static/app/js/tests/utils/MockLoader.js app/static/app/js/vendor/MTLLoader.js app/static/app/js/vendor/OBJLoader.js app/static/app/js/vendor/bootstrap.js app/static/app/js/vendor/bootstrap.min.js app/static/app/js/vendor/css-browser.js app/static/app/js/vendor/css-plugin-base.js app/static/app/js/vendor/css.js app/static/app/js/vendor/dropzone.js app/static/app/js/vendor/es6-shim.min.js app/static/app/js/vendor/globals-loader.js app/static/app/js/vendor/google-code-prettify/lang-Splus.js app/static/app/js/vendor/google-code-prettify/lang-aea.js app/static/app/js/vendor/google-code-prettify/lang-agc.js app/static/app/js/vendor/google-code-prettify/lang-apollo.js app/static/app/js/vendor/google-code-prettify/lang-basic.js app/static/app/js/vendor/google-code-prettify/lang-cbm.js app/static/app/js/vendor/google-code-prettify/lang-cl.js app/static/app/js/vendor/google-code-prettify/lang-clj.js app/static/app/js/vendor/google-code-prettify/lang-css.js app/static/app/js/vendor/google-code-prettify/lang-dart.js app/static/app/js/vendor/google-code-prettify/lang-el.js app/static/app/js/vendor/google-code-prettify/lang-erl.js app/static/app/js/vendor/google-code-prettify/lang-erlang.js app/static/app/js/vendor/google-code-prettify/lang-fs.js app/static/app/js/vendor/google-code-prettify/lang-go.js app/static/app/js/vendor/google-code-prettify/lang-hs.js app/static/app/js/vendor/google-code-prettify/lang-lasso.js app/static/app/js/vendor/google-code-prettify/lang-lassoscript.js app/static/app/js/vendor/google-code-prettify/lang-latex.js app/static/app/js/vendor/google-code-prettify/lang-lgt.js app/static/app/js/vendor/google-code-prettify/lang-lisp.js app/static/app/js/vendor/google-code-prettify/lang-ll.js app/static/app/js/vendor/google-code-prettify/lang-llvm.js app/static/app/js/vendor/google-code-prettify/lang-logtalk.js app/static/app/js/vendor/google-code-prettify/lang-ls.js app/static/app/js/vendor/google-code-prettify/lang-lsp.js app/static/app/js/vendor/google-code-prettify/lang-lua.js app/static/app/js/vendor/google-code-prettify/lang-matlab.js app/static/app/js/vendor/google-code-prettify/lang-ml.js app/static/app/js/vendor/google-code-prettify/lang-mumps.js app/static/app/js/vendor/google-code-prettify/lang-n.js app/static/app/js/vendor/google-code-prettify/lang-nemerle.js app/static/app/js/vendor/google-code-prettify/lang-pascal.js app/static/app/js/vendor/google-code-prettify/lang-proto.js app/static/app/js/vendor/google-code-prettify/lang-r.js app/static/app/js/vendor/google-code-prettify/lang-rd.js app/static/app/js/vendor/google-code-prettify/lang-rkt.js app/static/app/js/vendor/google-code-prettify/lang-rust.js app/static/app/js/vendor/google-code-prettify/lang-s.js app/static/app/js/vendor/google-code-prettify/lang-scala.js app/static/app/js/vendor/google-code-prettify/lang-scm.js app/static/app/js/vendor/google-code-prettify/lang-sql.js app/static/app/js/vendor/google-code-prettify/lang-ss.js app/static/app/js/vendor/google-code-prettify/lang-swift.js app/static/app/js/vendor/google-code-prettify/lang-tcl.js app/static/app/js/vendor/google-code-prettify/lang-tex.js app/static/app/js/vendor/google-code-prettify/lang-vb.js app/static/app/js/vendor/google-code-prettify/lang-vbs.js app/static/app/js/vendor/google-code-prettify/lang-vhd.js app/static/app/js/vendor/google-code-prettify/lang-vhdl.js app/static/app/js/vendor/google-code-prettify/lang-wiki.js app/static/app/js/vendor/google-code-prettify/lang-xq.js app/static/app/js/vendor/google-code-prettify/lang-xquery.js app/static/app/js/vendor/google-code-prettify/lang-yaml.js app/static/app/js/vendor/google-code-prettify/lang-yml.js app/static/app/js/vendor/google-code-prettify/prettify.css app/static/app/js/vendor/google-code-prettify/prettify.js app/static/app/js/vendor/google-code-prettify/run_prettify.js app/static/app/js/vendor/jquery-1.11.2.min.js app/static/app/js/vendor/leaflet/L.Control.MousePosition.css app/static/app/js/vendor/leaflet/L.Control.MousePosition.js app/static/app/js/vendor/leaflet/Leaflet.Autolayers/LICENSE app/static/app/js/vendor/leaflet/Leaflet.Autolayers/README.md app/static/app/js/vendor/leaflet/Leaflet.Autolayers/css/leaflet.auto-layers.css app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/arrow-down.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/arrow-up.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/close.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/layers-2x.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/layers.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/marker-icon-2x.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/marker-icon.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/marker-shadow.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/images/remove.png app/static/app/js/vendor/leaflet/Leaflet.Autolayers/leaflet-autolayers.js app/static/app/js/vendor/metisMenu.min.js app/static/app/js/vendor/modernizr-2.8.3.min.js app/static/app/js/vendor/potree.js app/static/app/js/vendor/system.js app/static/app/themes/fa/fa.js app/static/app/themes/gly/gly.js app/templates/app/3d_model_display.html app/templates/app/404.html app/templates/app/500.html app/templates/app/admin/404.html app/templates/app/admin/500.html app/templates/app/admin/actions.html app/templates/app/admin/app_index.html app/templates/app/admin/auth/user/add_form.html app/templates/app/admin/auth/user/change_password.html app/templates/app/admin/base.html app/templates/app/admin/base_site.html app/templates/app/admin/change_form.html app/templates/app/admin/change_list.html app/templates/app/admin/change_list_results.html app/templates/app/admin/date_hierarchy.html app/templates/app/admin/delete_confirmation.html app/templates/app/admin/delete_selected_confirmation.html app/templates/app/admin/edit_inline/stacked.html app/templates/app/admin/edit_inline/tabular.html app/templates/app/admin/filter.html app/templates/app/admin/includes/fieldset.html app/templates/app/admin/includes/object_delete_summary.html app/templates/app/admin/index.html app/templates/app/admin/invalid_setup.html app/templates/app/admin/login.html app/templates/app/admin/object_history.html app/templates/app/admin/pagination.html app/templates/app/admin/popup_response.html app/templates/app/admin/prepopulated_fields_js.html app/templates/app/admin/related_widget_wrapper.html app/templates/app/admin/search_form.html app/templates/app/admin/submit_line.html app/templates/app/base.html app/templates/app/dashboard.html app/templates/app/logged_in_base.html app/templates/app/map.html app/templates/app/processing_node.html app/templates/app/public/3d_model_display.html app/templates/app/public/3d_model_display_iframe.html app/templates/app/public/base.html app/templates/app/public/iframe_base.html app/templates/app/public/map.html app/templates/app/public/map_iframe.html app/templates/app/registration/form_field.html app/templates/app/registration/logged_out.html app/templates/app/registration/login.html app/templates/app/registration/password_change_done.html app/templates/app/registration/password_change_form.html app/templates/app/registration/password_reset_complete.html app/templates/app/registration/password_reset_confirm.html app/templates/app/registration/password_reset_done.html app/templates/app/registration/password_reset_form.html app/templates/app/registration/registration_base.html app/templates/app/welcome.html app/templatetags/__init__.py app/templatetags/bootstrap_extras.py app/templatetags/plugins.py app/templatetags/processingnode_extras.py app/templatetags/settings.py app/tests/__init__.py app/tests/classes.py app/tests/grass_scripts/simple_test.grass app/tests/test_api.py app/tests/test_api_preset.py app/tests/test_api_task.py app/tests/test_api_task_import.py app/tests/test_app.py app/tests/test_db.py app/tests/test_gdal.py app/tests/test_generate_ui_mocks.py app/tests/test_plugins.py app/tests/test_settings.py app/tests/test_testwatch.py app/tests/test_theme.py app/tests/test_welcome.py app/tests/test_worker.py app/tests/utils.py app/testwatch.py app/uploadhandler.py app/urls.py app/views/__init__.py app/views/app.py app/views/public.py build/.gitignore contrib/ubuntu_1604_install.sh db/Dockerfile db/init.sql devenv.sh docker-compose.build.yml docker-compose.dev.yml docker-compose.nodeodm.yml docker-compose.ssl-manual.yml docker-compose.ssl.yml docker-compose.yml jest.config.js manage.py nginx/.gitignore nginx/crontab nginx/letsencrypt-autogen.sh nginx/nginx-ssl.conf.template nginx/nginx.conf.template nodeodm/__init__.py nodeodm/admin.py nodeodm/apps.py nodeodm/external/.gitignore nodeodm/fixtures/test_images/DJI_0176.JPG nodeodm/fixtures/test_images/DJI_0177.JPG nodeodm/fixtures/test_images/DJI_0178.JPG nodeodm/fixtures/test_images/DJI_0179.JPG nodeodm/fixtures/test_images/DJI_0180.JPG nodeodm/fixtures/test_processingnodes.json nodeodm/migrations/.gitignore nodeodm/migrations/0001_initial.py nodeodm/migrations/0002_processingnode_token.py nodeodm/migrations/0003_auto_20180625_1230.py nodeodm/migrations/0004_processingnode_max_images.py nodeodm/migrations/0005_auto_20190115_1346.py nodeodm/migrations/0006_auto_20190220_1842.py nodeodm/migrations/__init__.py nodeodm/models.py nodeodm/status_codes.py nodeodm/tests.py nodeodm/views.py package.json plugins/.gitignore plugins/diagnostic/__init__.py plugins/diagnostic/manifest.json plugins/diagnostic/plugin.py plugins/diagnostic/public/Chart.min.js plugins/diagnostic/templates/diagnostic.html plugins/elevationmap/ToDo.txt plugins/elevationmap/__init__.py plugins/elevationmap/api.py plugins/elevationmap/calc_elevation_map.grass plugins/elevationmap/disabled plugins/elevationmap/elevationmap.py plugins/elevationmap/manifest.json plugins/elevationmap/plugin.py plugins/elevationmap/public/ElevationMap.jsx plugins/elevationmap/public/ElevationMap.scss plugins/elevationmap/public/ElevationMapPanel.jsx plugins/elevationmap/public/ElevationMapPanel.scss plugins/elevationmap/public/icon.png plugins/elevationmap/public/main.js plugins/elevationmap/public/package.json plugins/elevationmap/requirements.txt plugins/lightning/__init__.py plugins/lightning/manifest.json plugins/lightning/plugin.py plugins/lightning/public/CostEstimateItem.jsx plugins/lightning/public/CostEstimateItem.scss plugins/lightning/public/Dashboard.jsx plugins/lightning/public/Dashboard.scss plugins/lightning/public/Login.jsx plugins/lightning/public/Login.scss plugins/lightning/public/add_cost_estimate.js plugins/lightning/public/app.jsx plugins/lightning/public/app.scss plugins/lightning/templates/index.html plugins/measure/__init__.py plugins/measure/api.py plugins/measure/calc_volume.grass plugins/measure/manifest.json plugins/measure/plugin.py plugins/measure/public/MeasurePopup.jsx plugins/measure/public/MeasurePopup.scss plugins/measure/public/app.jsx plugins/measure/public/app.scss plugins/measure/public/main.js plugins/measure/public/package.json plugins/openaerialmap/__init__.py plugins/openaerialmap/api.py plugins/openaerialmap/load_buttons.js plugins/openaerialmap/manifest.json plugins/openaerialmap/plugin.py plugins/openaerialmap/public/ShareButton.jsx plugins/openaerialmap/public/ShareDialog.jsx plugins/openaerialmap/public/fonts/oamfont.eot plugins/openaerialmap/public/fonts/oamfont.svg plugins/openaerialmap/public/fonts/oamfont.ttf plugins/openaerialmap/public/fonts/oamfont.woff plugins/openaerialmap/public/style.css plugins/openaerialmap/templates/app.html plugins/osm-quickedit/__init__.py plugins/osm-quickedit/manifest.json plugins/osm-quickedit/plugin.py plugins/osm-quickedit/public/main.js plugins/posm-gcpi/__init__.py plugins/posm-gcpi/manifest.json plugins/posm-gcpi/plugin.py plugins/posm-gcpi/public/package.json plugins/posm-gcpi/templates/app.html plugins/test/__init__.py plugins/test/dynamic.js plugins/test/manifest.json plugins/test/plugin.py plugins/test/public/component.jsx plugins/test/public/file.txt plugins/test/public/main.css plugins/test/public/main.js plugins/test/public/package.json plugins/test/templates/app.html requirements.txt screenshots/dashboard.png screenshots/pointcloud.png screenshots/ui-mockup.png service/webodm-celery.service service/webodm-celerybeat.service service/webodm-docker.service service/webodm-gunicorn.service service/webodm-nginx.service slate/.github/ISSUE_TEMPLATE.md slate/.github/PULL_REQUEST_TEMPLATE.md slate/.gitignore slate/.travis.yml slate/CHANGELOG.md slate/Gemfile slate/Gemfile.lock slate/LICENSE slate/README.md slate/Vagrantfile slate/config.rb slate/deploy.sh slate/diagrams/README.md slate/diagrams/WebODM.xml slate/examples/process_images.py slate/examples/status_codes.py slate/font-selection.json slate/lib/multilang.rb slate/source/fonts/slate.eot slate/source/fonts/slate.svg slate/source/fonts/slate.ttf slate/source/fonts/slate.woff slate/source/fonts/slate.woff2 slate/source/images/logo.png slate/source/images/navbar.png slate/source/includes/_fordevelopers.md slate/source/includes/_introduction.md slate/source/includes/_quickstart.md slate/source/includes/reference/_authentication.md slate/source/includes/reference/_handlingerrors.md slate/source/includes/reference/_permissions.md slate/source/includes/reference/_processingnode.md slate/source/includes/reference/_project.md slate/source/includes/reference/_task.md slate/source/index.html.md slate/source/javascripts/all.js slate/source/javascripts/all_nosearch.js slate/source/javascripts/app/_lang.js slate/source/javascripts/app/_search.js slate/source/javascripts/app/_toc.js slate/source/javascripts/lib/_energize.js slate/source/javascripts/lib/_imagesloaded.min.js slate/source/javascripts/lib/_jquery.highlight.js slate/source/javascripts/lib/_jquery.js slate/source/javascripts/lib/_jquery.tocify.js slate/source/javascripts/lib/_jquery_ui.js slate/source/javascripts/lib/_lunr.js slate/source/layouts/layout.erb slate/source/stylesheets/_icon-font.scss slate/source/stylesheets/_normalize.scss slate/source/stylesheets/_variables.scss slate/source/stylesheets/print.css.scss slate/source/stylesheets/screen.css.scss start.sh wait-for-it.sh wait-for-postgres.sh webodm.sh webodm/__init__.py webodm/settings.py webodm/urls.py webodm/wsgi.py webpack-server.js webpack.config.js worker.sh worker/__init__.py worker/celery.py worker/tasks.py Please move or remove them before you can merge. Aborting