[devdocsgjs/main: 677/1867] Fix merge conflicts

[Andy Holmes <andyholmes src gnome org>]

commit 5438143cf80452af90e4d485efed7dad22803511
Merge: 4355631c ac50e992
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Sat Jul 20 02:36:21 2019 +0200

    Fix merge conflicts

 .editorconfig                                      |   3 +
 .github/CONTRIBUTING.md                            |   6 +-
 .gitignore                                         |   1 +
 .travis.yml                                        |   8 +
 CODE_OF_CONDUCT.md                                 |   2 +
 Dockerfile                                         |   1 +
 Dockerfile-alpine                                  |   1 +
 PULL_REQUEST_TEMPLATE.md                           |  11 +
 README.md                                          |  46 ++++-
 assets/javascripts/app/app.coffee                  |  16 +-
 assets/javascripts/app/appcache.coffee             |  42 ----
 assets/javascripts/app/config.coffee.erb           |   2 +
 assets/javascripts/app/serviceworker.coffee        |  49 +++++
 assets/javascripts/app/settings.coffee             |  30 +++
 assets/javascripts/app/update_checker.coffee       |   6 +-
 assets/javascripts/lib/util.coffee                 |   4 +
 assets/javascripts/news.json                       |   4 +
 assets/javascripts/templates/error_tmpl.coffee     |  10 +-
 .../templates/pages/offline_tmpl.coffee            |  13 +-
 .../templates/pages/root_tmpl.coffee.erb           |   4 +-
 assets/javascripts/views/content/entry_page.coffee |   2 +-
 .../javascripts/views/content/settings_page.coffee |  12 +-
 assets/javascripts/views/layout/resizer.coffee     |  11 +-
 assets/javascripts/views/layout/settings.coffee    |  10 +-
 assets/javascripts/views/search/search.coffee      |   8 +
 .../javascripts/views/search/search_scope.coffee   |  28 ++-
 assets/javascripts/views/sidebar/sidebar.coffee    |   2 +-
 assets/stylesheets/components/_header.scss         |   1 +
 docs/adding-docs.md                                |  23 +++
 docs/filter-reference.md                           | 224 +++++++++++++++++++++
 docs/{maintainers_guide.md => maintainers.md}      |  14 +-
 docs/scraper-reference.md                          | 186 +++++++++++++++++
 lib/app.rb                                         |  55 +++--
 public/docs/docs.json                              |   1 -
 public/images/webapp-icon-192.png                  | Bin 0 -> 32187 bytes
 public/manifest.json                               |   6 +
 test/app_test.rb                                   |  81 --------
 views/app.erb                                      |  14 +-
 views/index.erb                                    |   5 +-
 views/manifest.erb                                 |  14 --
 views/other.erb                                    |   5 +-
 views/service-worker.js.erb                        |  49 +++++
 views/unsupported.erb                              |   6 +-
 43 files changed, 761 insertions(+), 255 deletions(-)
---
diff --cc assets/javascripts/views/content/settings_page.coffee
index ed574097,af2e9a9d..21de111a
--- a/assets/javascripts/views/content/settings_page.coffee
+++ b/assets/javascripts/views/content/settings_page.coffee
@@@ -17,8 -14,7 +14,8 @@@ class app.views.SettingsPage extends ap
      settings.dark = app.settings.get('dark')
      settings.smoothScroll = !app.settings.get('fastScroll')
      settings.arrowScroll = app.settings.get('arrowScroll')
 +    settings.analyticsConsent = app.settings.get('analyticsConsent')
-     settings[layout] = app.settings.hasLayout(layout) for layout in LAYOUTS
+     settings[layout] = app.settings.hasLayout(layout) for layout in app.settings.LAYOUTS
      settings
  
    getTitle: ->