Merge branch 'template-formula' of https://github.com/noelmcloughlin/…

…sysstat-formula into template-formula
saltstack-formulas · Jun 25, 2019 · 203a8ea · 203a8ea
2 parents 1e3cdc9 + 873ae0f
commit 203a8ea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -47,7 +47,10 @@ coverage.xml
 .hypothesis/
 .kitchen
 .kitchen.local.yml
+<<<<<<< HEAD
 kitchen.local.yml
+=======
+>>>>>>> 873ae0f132f728b86d0f7d910dd383c34f5f1fb8
 
 # Translations
 *.mo
@@ -103,6 +106,7 @@ ENV/
 # mypy
 .mypy_cache/
 
+<<<<<<< HEAD
 # Bundler
 Gemfile.lock
 
@@ -111,3 +115,7 @@ docs/*.md
 
 # Vim
 *.sw?
+=======
+# copied `.md` files used for conversion to `.rst` using `m2r`
+docs/*.md
+>>>>>>> 873ae0f132f728b86d0f7d910dd383c34f5f1fb8
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
diff --git a/docs/README.rst b/docs/README.rst
@@ -102,7 +102,6 @@ dependency on ``sysstat.service.clean`` via include list.
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This state will remove the sysstat package and has a depency on
-``sysstat.config.clean`` via include list.
 
 ``sysstat.source.clean``
 ^^^^^^^^^^^^^^^^^^^^^^^^