merge conflict fix

This commit is contained in:
Mamoru TASAKA 2013-08-06 16:36:08 +09:00
parent 1d81d3915b
commit 5013905b5f
1 changed files with 3 additions and 0 deletions

View File

@ -297,6 +297,9 @@ popd
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Mar 26 2013 Mamoru TASAKA <mtasaka@fedoraproject.org>
- Rebuild due to wrong %%gem_extdir_mri macro (bug 927471)
* Tue Mar 19 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.12.4-1
- 1.12.4