diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-14 08:55:59 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-14 08:55:59 -0400 |
commit | e861c6134e556a90feda1c3681c12e68398daf5e (patch) | |
tree | 06719c68667884d87b03f23e6ce00ea42dcd9aab /misc/bcfg2_logo.png | |
parent | 31e91d3b8a8a11c60c6f0bb005ac6f680949b01d (diff) | |
parent | dd8594eb5427610ade2f1f8abf465cde8c9568fd (diff) | |
download | bcfg2-e861c6134e556a90feda1c3681c12e68398daf5e.tar.gz bcfg2-e861c6134e556a90feda1c3681c12e68398daf5e.tar.bz2 bcfg2-e861c6134e556a90feda1c3681c12e68398daf5e.zip |
resolved bcfg2-repo-validate conflicts
Diffstat (limited to 'misc/bcfg2_logo.png')
0 files changed, 0 insertions, 0 deletions