[dvtm/f21: 4/4] Resolve the rebuild changelog conflict

[Petr Šabata]

commit 1d36d3fb096d4e72f52cbcfd4fab1f2fce9899c0
Merge: 6bfba39 3c1cd73
Author: Petr Šabata <contyk at redhat.com>
Date:   Tue Nov 18 16:00:00 2014 +0100

    Resolve the rebuild changelog conflict

 .gitignore                                     |    2 +
 dvtm-0.10-build.patch => dvtm-0.13-build.patch |   27 ++++++++---------------
 dvtm.spec                                      |   19 +++++++++-------
 sources                                        |    2 +-
 4 files changed, 24 insertions(+), 26 deletions(-)
---