diff --git a/README.md b/README.md index 65f2d0f7..9dd4c107 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # sing-box-extended Sing-box with extended features. @@ -13,9 +12,6 @@ Sing-box with extended features. * SDNS (DNSCrypt) * Extended Wireguard options * Unified delay -======= -# sing-box ->>>>>>> v1.13.11 ## Examples