[pam_radius/f21: 3/3] fix merge

[Peter Robinson]

commit 811a73165b2c9203c196f6116e5891a49bac7148
Merge: eab38e8 caa9f8b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jan 21 13:29:55 2015 +0000

    fix merge

 .gitignore      |    9 +--------
 pam_radius.spec |   17 ++++++++---------
 sources         |    6 ------
 3 files changed, 9 insertions(+), 23 deletions(-)
---