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/pref.h b/pref.h
index 3791f62e7..e471add73 100644
--- a/pref.h
+++ b/pref.h
@@ -117,6 +117,7 @@ struct preferences {
 	bool cloud_background_sync;
 	geocoding_prefs_t geocoding;
 	enum deco_mode deco_mode;
+	short conservatism_level;
 };
 enum unit_system_values {
 	METRIC,