[bwa/f21: 4/4] fix merge

[Peter Robinson]

commit 8d21f105b7c6d85a3a604c6eaaf71c90c7ba7b28
Merge: d2f96f4 1c5dfe4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Nov 17 21:45:47 2014 +0000

    fix merge

 .gitignore |    1 +
 bwa.spec   |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---