diff options
| author | Aaron Stone <aaron@serendipity.cx> | 2012-10-19 01:35:10 -0700 |
|---|---|---|
| committer | Aaron Stone <aaron@serendipity.cx> | 2012-10-19 01:35:10 -0700 |
| commit | 2b540b6d2b3c6acab48ad1515b4d5da98d363391 (patch) | |
| tree | 6a2223ea8ea36790943ec8e433868ebbda6d690c /README.markdown | |
| parent | 72df8ecb489c13a0bf7bdb78455e6d523404dd8b (diff) | |
| parent | 109d181b8ec6130151b2e8144cdaecf986a96075 (diff) | |
Merge branch 'master' into dummy-provider
Conflicts:
lib/puppet/provider/vcsrepo/cvs.rb
spec/support/fixture_helpers.rb
spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
Diffstat (limited to 'README.markdown')
| -rw-r--r-- | README.markdown | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/README.markdown b/README.markdown index 33fddcb..823e044 100644 --- a/README.markdown +++ b/README.markdown @@ -11,9 +11,9 @@ This type can be used to describe: * A working copy checked out from a (remote or local) source, at an arbitrary revision * A "blank" working copy not associated with a source (when it makes - sense for the VCS being used) + sense for the VCS being used) * A "blank" central repository (when the distinction makes sense for the VCS - being used) + being used) Supported Version Control Systems --------------------------------- |