merge

solana-labs · Apr 24, 2018 · d715a29 · d715a29
1 parent 04bd800
commit d715a29
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs
@@ -449,8 +449,6 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
         });
         Ok(vec![t_blob_receiver, t_retransmit, t_window, t_server])
     }
-=======
->>>>>>> d620ce5... update
 }
 
 #[cfg(test)]