Merge branch 'boyle-ready' of https://github.com/Slagvi/subsurface

Fixed merge conflicts in
	deco.c
	dive.h
	planner.c

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h
index a8524393a..b87ed84c3 100644
--- a/qt-models/diveplannermodel.h
+++ b/qt-models/diveplannermodel.h
@@ -65,6 +65,7 @@ slots:
 	void triggerGFHigh();
 	void setGFLow(const int ghflow);
 	void triggerGFLow();
+	void setConservatism(int level);
 	void setSurfacePressure(int pressure);
 	void setSalinity(int salinity);
 	int getSurfacePressure();