Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(formula): align with template-formula v3.0.0 #12

Merged
merged 9 commits into from
Jul 19, 2019
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ coverage.xml
.hypothesis/
.kitchen
.kitchen.local.yml
<<<<<<< HEAD
noelmcloughlin marked this conversation as resolved.
Show resolved Hide resolved
kitchen.local.yml
=======
>>>>>>> 873ae0f132f728b86d0f7d910dd383c34f5f1fb8

# Translations
*.mo
Expand Down Expand Up @@ -103,6 +106,7 @@ ENV/
# mypy
.mypy_cache/

<<<<<<< HEAD
# Bundler
Gemfile.lock

Expand All @@ -111,3 +115,7 @@ docs/*.md

# Vim
*.sw?
=======
# copied `.md` files used for conversion to `.rst` using `m2r`
docs/*.md
>>>>>>> 873ae0f132f728b86d0f7d910dd383c34f5f1fb8
Empty file added docs/AUTHORS.rst
Empty file.
Empty file added docs/CHANGELOG.rst
Empty file.
1 change: 0 additions & 1 deletion docs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``
^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down