Skip to content

Commit

Permalink
Fix merge master into nightly (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
bobidle authored Sep 28, 2023
1 parent 3bfd8e9 commit 47c5916
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 26 deletions.
12 changes: 0 additions & 12 deletions i18n/gluon-site.pot
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,3 @@ msgstr ""

msgid "gluon-config-mode:contact-note"
msgstr ""

msgid "gluon-config-mode:contact-help"
msgstr ""

msgid "gluon-config-mode:contact-note"
msgstr ""

msgid "gluon-config-mode:hostname-help"
msgstr ""

msgid "gluon-config-mode:geo-location-help"
msgstr ""
2 changes: 1 addition & 1 deletion modules.example
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

## PACKAGES_$feedname_BRANCH
# the branch to check out
#PACKAGES_MY_OWN_PACKAGES_BRANCH=my_branch
#PACKAGES_MY_OWN_PACKAGES_BRANCH=my_branch
13 changes: 0 additions & 13 deletions site.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
},
},
autoupdater = {
enabled = 1,
branch = 'stable',
branches = {
stable = {
Expand Down Expand Up @@ -103,16 +102,4 @@
min_password_length = 12
},
}

config_mode = {
geo_location = {
osm = {
center = {
lat = 50.9854,
lon = 10.8749,
},
zoom = 12,
},
},
},
}

0 comments on commit 47c5916

Please sign in to comment.