CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from Control-D-Inc/cuonglm/fix-readme-conflicts

Browse Source 
Remove conflicts marker in README.md
This commit is contained in:
Yegor S
2023-02-07 11:54:13 -05:00
committed by GitHub
parent 3602484109 56d8c102e1
commit be6e2cc0a2
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
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