[gpart/f21: 3/3] fix merge

[Peter Robinson]

commit a5dedfe04666e39abaddea68f81af5277ef888c4
Merge: be2c4ae d6e9e5c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Dec 16 07:50:29 2014 +0000

    fix merge

 gpart.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---