From 7426034172cabee533118610d88ab6fa33d4ef06 Mon Sep 17 00:00:00 2001 From: Christopher Lackner Date: Thu, 13 Dec 2018 14:25:27 +0100 Subject: [PATCH] fix merge error with pybind --- external_dependencies/pybind11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_dependencies/pybind11 b/external_dependencies/pybind11 index e2b884c3..2a150736 160000 --- a/external_dependencies/pybind11 +++ b/external_dependencies/pybind11 @@ -1 +1 @@ -Subproject commit e2b884c33bcde70b2ea562ffa52dd7ebee276d50 +Subproject commit 2a150736601bb3113877bb673fb934bb60d46ec5