.gitignore: pycharm remote execution update

[mirror_ifupdown2.git] / docs / source / addonsapiref.rst

diff --git a/docs/source/addonsapiref.rst b/docs/source/addonsapiref.rst
index 9b114fd93c129aa6c52ff50b362708d002184587..82a89062fd8b98ff9a573235a51baf2dc7cc0e35 100644 (file)
--- a/docs/source/addonsapiref.rst
+++ b/docs/source/addonsapiref.rst
@@ -32,21 +32,12 @@ ethtool
 
 .. autoclass:: ethtool
 
-<<<<<<< HEAD
-ifenslave
-=========
-
-.. automodule:: ifenslave
-
-.. autoclass:: ifenslave
-=======
 bond
 ====
 
 .. automodule:: bond
 
 .. autoclass:: bond
->>>>>>> cumulus/dev
 
 mstpctl
 =======