From a58b36117dc59b3eec8d5404ff6cd48b78245960 Mon Sep 17 00:00:00 2001 From: Kevin Putnam Date: Fri, 9 Nov 2018 16:45:58 -0800 Subject: [PATCH] fixed dangling reviewer comment --- source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt b/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt index b02e3fb5..ca4f64b8 100644 --- a/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt +++ b/source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt @@ -1,11 +1,6 @@ Autoproxy allows |CL| to operate seamlessly behind a proxy -<<<<<<< a5c93dbc693eb8183bba173f39ac3956c37d9525:source/clear-linux/guides/clearlinux/autoproxy_guide.rst.txt because :ref:`software update ` and other |CL| tools are implemented on top of libcurl. Tools that do not use libcurl, like git, must -======= -because :ref:`swupd-guide` and other |CL| tools are implemented on -top of libcurl. Tools that do not use libcurl, like git, must ->>>>>>> changes based on reviewer comments:source/clear-linux/guides/clearlinux/autoproxy_guide.txt be configured independently. If you encounter problems with autoproxy functioning, use