merge conflict fix
This commit is contained in:
parent
1d81d3915b
commit
5013905b5f
@ -297,6 +297,9 @@ popd
|
|||||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.4-2
|
* 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
|
- 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
|
* Tue Mar 19 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.12.4-1
|
||||||
- 1.12.4
|
- 1.12.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user