fixing conflict

This commit is contained in:
Emmanuel Bretelle 2008-07-04 13:00:16 +01:00
parent 113ae17b79
commit 0acb0152d6
2 changed files with 1 additions and 1666 deletions

1664
terminator

File diff suppressed because it is too large Load Diff

View File

@ -43,6 +43,5 @@ grep -v man/man1 FILELIST.tmp > FILELIST
%changelog %changelog
* Fri Jul 04 2008 - chantra AatT rpm-based DdOoTt org 0.9.fc9.rb * Fri Jul 04 2008 - chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
- New upstream release - New upstream release
* Sat May 17 2008 - chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb * Sat May 17 2008 - chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
- Initial release for Fedora 9. - Initial release for Fedora 9.