summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 11:28:43 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 11:29:07 -0700
commit48b3e3b8eae86deecad19896eb88da9ee7d5a625 (patch)
tree40bb15194a6b334cf9ca2439c3cfa65d5d71ab3c /.gitignore
parentf531a2936ed73e90244c2842730fb3508e884da3 (diff)
Revert "Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'""""
This reverts commit 2885d314b61055d20d85d36a68214f7d9e1e6ac6. No, really. Keep the !@#$% integration branches around so we don't have this revert nightmare again.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions