From 6176b889dc5b5eef9a86bb85cf57a16ba277da9e Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Sun, 29 Jan 2017 22:58:19 +0100
Subject: [PATCH] fix(hackrf_transfer): Fix missed merge conflict

---
 host/hackrf-tools/src/hackrf_transfer.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/host/hackrf-tools/src/hackrf_transfer.c b/host/hackrf-tools/src/hackrf_transfer.c
index 9b668293..a36166c6 100644
--- a/host/hackrf-tools/src/hackrf_transfer.c
+++ b/host/hackrf-tools/src/hackrf_transfer.c
@@ -402,7 +402,6 @@ int rx_callback(hackrf_transfer* transfer) {
 				return 0;
 			}
 		}
-		}
 	} else {
 		return -1;
 	}
@@ -1093,7 +1092,6 @@ int main(int argc, char** argv) {
 				break;
 			}
 		}
-		}
 	}
 	
 	result = hackrf_is_streaming(device);