CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-05-15 00:50:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflicts marker in README.md

Browse Source
This commit is contained in:
Cuong Manh Le
2023-02-07 23:22:12 +07:00
committed by Cuong Manh Le
parent 3602484109
commit 56d8c102e1
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
-1
View File
@@ -137,7 +137,6 @@ Once you run the above command, the following things will happen:
See [Configuration Docs](docs/config.md).
### Example
>>>>>>> ed393c1 (Update README.md)
- Start `listener.0` on 127.0.0.1:53
- Accept queries from any source address
- Send all queries to `upstream.0` via DoH protocol