Merge branch 'master' of grenfell.avtechpulse.com:Instrument

Conflicts:
	instr-daemon.c

1 files changed, 0 insertions, 1 deletions

diff --git a/flash.h b/flash.h
index 739fefa..c2d3b0e 100644
--- a/flash.h
+++ b/flash.h
@@ -5,7 +5,6 @@
 #include <glib.h>
 
 void initFlash(FlashStruct *mem, gboolean reset_to_defaults, int starting_location);
-int readUserBlock(FlashStruct *mem);
 void writeUserBlock(FlashStruct *mem, int addr, int numbytes);
 void fixFlash(FlashStruct *mem);