From 56d8c102e189d2db1a1ec500b1169e7869c18154 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Tue, 7 Feb 2023 23:22:12 +0700 Subject: [PATCH] Remove conflicts marker in README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 09d6701..c56fd7a 100644 --- a/README.md +++ b/README.md @@ -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