HomePhorge

Fix augeas_spec branch merging mistake
c1d7634e6f75Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Fix augeas_spec branch merging mistake

spec/unit/provider/augeas/augeas_spec.rb had merge conflicts when I
merged 2.7.x into master. I resolved them incorrectly at first, then
forgot to add the fixed resolution to the merge commit before pushing,
so all the tests passed on my local machine. This corrects that merge
resolution so that tests all pass.

Details

Provenance
Matt Robinson <matt@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU5d3369ebb4f1: Merge branch '2.7.x'
Branches
Unknown
Tags
Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPUc1d7634e6f75: Fix augeas_spec branch merging mistake (authored by Matt Robinson <matt@puppetlabs.com>).Jan 3 2012, 8:47 PM