diff options
| author | Micah Anderson <micah@riseup.net> | 2006-11-01 21:40:46 +0000 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2006-11-01 21:40:46 +0000 |
| commit | 0f46b775b9ef027abe15a974395d111a83f29ef3 (patch) | |
| tree | 86428783c4a5a0fa3ccd4e1811b837af21126f8e /Makefile.am | |
| parent | 42b7be6130c2e4ebc29ea87647aa80a34c596215 (diff) | |
| download | backupninja-0f46b775b9ef027abe15a974395d111a83f29ef3.tar.gz backupninja-0f46b775b9ef027abe15a974395d111a83f29ef3.tar.bz2 | |
my changelog was in conflict, resolving this
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions