diff options
| -rw-r--r-- | system/include/emscripten/bind.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h index 1ce7967d..97a9b5cc 100644 --- a/system/include/emscripten/bind.h +++ b/system/include/emscripten/bind.h @@ -100,8 +100,6 @@ namespace emscripten { GenericFunction destructor, GenericFunction getPointee); -<<<<<<< HEAD -======= void _embind_register_function_ptr( const char* name, TYPEID functorType, @@ -111,7 +109,6 @@ namespace emscripten { GenericFunction destructor, GenericFunction invoker); ->>>>>>> Exposing std::function to javascript. void _embind_register_vector( TYPEID vectorType, TYPEID elementType, |