Skip to content

Commit

Permalink
should fix the conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Bockiii committed Jun 28, 2021
1 parent 062194d commit 2bb4f21
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions config.default.ini.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@
; "" = Disabled (default)
email = ""

[bridges]
; Whitelist all bridges from the config or by environment variable.
; This will overwrite bridges configured in the whitelist.txt file!
; false = disabled (default)
; true = enabled
whitelistall = false

[proxy]

; Sets the proxy url (i.e. "tcp://192.168.0.0:32")
Expand All @@ -51,6 +44,13 @@
; false = disabled (default)
by_bridge = false

[bridges]
; Whitelist all bridges from the config or by environment variable.
; This will overwrite bridges configured in the whitelist.txt file!
; false = disabled (default)
; true = enabled
whitelistall = false

[authentication]

; Enables authentication for all requests to this RSS-Bridge instance.
Expand Down

0 comments on commit 2bb4f21

Please sign in to comment.