[mate-control-center/f19: 6/6] fix merge conflict in .gitignore

[Wolfgang Ulbrich]

commit 8d1a883c53626fa1453bc7d61472de2aa5302668
Merge: 64f96b6 4ecb906
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Jul 30 21:46:25 2013 +0200

    fix merge conflict in .gitignore

 .gitignore               |    4 +---
 mate-control-center.spec |   30 +++++++++++++++---------------
 sources                  |    2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)
---