[Bf-blender-cvs] [31555c4] gooseberry: Gooseberry: Fix someone's bad merge conflict resolve in BGE stubs

[Sergey Sharybin]

Commit: 31555c4cdbd25b66cac2fa4e478883ebe859e66c
Author: Sergey Sharybin
Date:   Tue Jul 7 08:55:00 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB31555c4cdbd25b66cac2fa4e478883ebe859e66c

Gooseberry: Fix someone's bad merge conflict resolve in BGE stubs

===================================================================

M	source/blenderplayer/bad_level_call_stubs/stubs.c

===================================================================

diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 54de824..5936397 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -312,7 +312,6 @@ void WM_cursor_modal_restore(struct wmWindow *win) RET_NONE
 void WM_cursor_time(struct wmWindow *win, int nr) RET_NONE
 void WM_cursor_warp(struct wmWindow *win, int x, int y) RET_NONE
 
-<<<<<<< HEAD
 void WM_widgetmap_delete(struct wmWidgetMap *wmap) RET_NONE
 struct wmWidgetMapType *WM_widgetmaptype_find(const char *idname, int spaceid, int regionid, bool is_3d, bool create) RET_NULL
 struct wmWidgetGroupType *WM_widgetgrouptype_new(int (*poll)(const struct bContext *, struct wmWidgetGroupType *),