summaryrefslogtreecommitdiffstats
path: root/ext/facter-diff
diff options
context:
space:
mode:
authorRein Henrichs <rein@puppetlabs.com>2010-10-07 10:06:14 -0700
committerRein Henrichs <rein@puppetlabs.com>2010-10-07 10:06:14 -0700
commitf4da5285f1cedfed476eed37d40e1404e2801c48 (patch)
tree0909bc9243c23b3311f4279abca0bc1acdf59654 /ext/facter-diff
parentdce8f5727c4b6ee0332500c189775cc7c036e6d0 (diff)
maint: Fix merge error
Diffstat (limited to 'ext/facter-diff')
0 files changed, 0 insertions, 0 deletions