# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1552305825 -3600
# Node ID 381144d2434f3605ad894c0e29d877649499a3a1
# Parent  dea3787a8f4b09a9c44ade2338482209d3defb52# Parent  72faa732532b193699300976cd23fe40043ab5df
merge AM fixes

diff -r dea3787a8f4b -r 381144d2434f Resources/CodeGeneration/template.in.h
--- a/Resources/CodeGeneration/template.in.h	Mon Mar 11 13:02:46 2019 +0100
+++ b/Resources/CodeGeneration/template.in.h	Mon Mar 11 13:03:45 2019 +0100
@@ -13,7 +13,6 @@
 #include <sstream>
 #include <assert.h>
 #include <memory>
-#include <optional>
 #include <json/json.h>
 
 //#define STONEGEN_NO_CPP11 1