[cinnamon/f20: 3/3] fix merge

[leigh123linux]

commit 7fbe9a77bdddcb5c1ad4b6b43d1c910327731627
Merge: 44155db 4acaaaf
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 12 18:09:21 2014 +0000

    fix merge

 .gitignore                                         |    1 +
 ...override => cinnamon-fedora-20.gschema.override |    4 ++++
 cinnamon.spec                                      |   17 +++++++++++------
 sources                                            |    2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)
---