[PATCH 2/2] Test for explorer.exe with Bugs fixed

[Carlos Vega García]

---
 programs/explorer/tests/explorer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c
index 28e1ad3..032ef6f 100755
--- a/programs/explorer/tests/explorer.c
+++ b/programs/explorer/tests/explorer.c
@@ -132,8 +132,13 @@ int explorer_available(void)
 	STARTUPINFOA si;
 	PROCESS_INFORMATION pi;
 	LPDWORD lpExitCode;
+<<<<<<< HEAD
 	char cmd[] = {'e','x','p','l','o','r','e','r',' ','/','r','o','o','t',0};
 	char windowName[] = {'r','o','o','t',0};
+=======
+	char cmd[] = {'e','x','p','l','o','r','e','r',' ','C',':',92,'w','i','n','d','o','w','s',0};
+	char windowName[] = {'w','i','n','d','o','w','s',0};
+>>>>>>> b2b5eab... Test for explorer with Bugs fixed
 
 	memset(&si, 0, sizeof(si));
 	si.cb = sizeof(si);
-- 
2.7.4