From f61db9cac880194b55021c851808e4a8bf868463 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 2 Apr 2019 15:33:38 +1100
Subject: [PATCH] Fix merge conflict in `bls`

Issue came about from Michael and Kirk doing simultaneous work.
---
 eth2/utils/bls/src/aggregate_signature.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eth2/utils/bls/src/aggregate_signature.rs b/eth2/utils/bls/src/aggregate_signature.rs
index f446ce71e..8c7ae5222 100644
--- a/eth2/utils/bls/src/aggregate_signature.rs
+++ b/eth2/utils/bls/src/aggregate_signature.rs
@@ -38,7 +38,8 @@ impl AggregateSignature {
 
     /// Add (aggregate) another `AggregateSignature`.
     pub fn add_aggregate(&mut self, agg_signature: &AggregateSignature) {
-        self.0.add_aggregate(&agg_signature.0)
+        self.aggregate_signature
+            .add_aggregate(&agg_signature.aggregate_signature)
     }
 
     /// Verify the `AggregateSignature` against an `AggregatePublicKey`.