commit fa3da96c5cba5a1dcd3b7fb07daa7d4101f61eaf Merge: d2c1149 9ea7afa Author: Troy Dawson <[email protected]> Date: Tue Oct 14 17:01:46 2014 -0500
fixing merge conflicts
.gitignore | 2 --
etcd.service | 8 ++++----
etcd.spec | 12 +++++++++---
3 files changed, 13 insertions(+), 9 deletions(-)
---
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
