From 25ee1e6c29fbf41f280eb9746c4cd0fda86402a6 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 23 Feb 2015 13:12:29 +0000
Subject: [PATCH] .uppdev

git-svn-id: svn://ultimatepp.org/upp/trunk@8195 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppdev/RichEditTest/main.cpp | 3 ---
 uppdev/cpp/main.cpp          | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/uppdev/RichEditTest/main.cpp b/uppdev/RichEditTest/main.cpp
index 54e1b8093..165875c15 100644
--- a/uppdev/RichEditTest/main.cpp
+++ b/uppdev/RichEditTest/main.cpp
@@ -1,6 +1,5 @@
 #include <RichEdit/RichEdit.h>
 
-<<<<<<< .mine
 #define Time    XTime
 #define Font    XFont
 #define Display XDisplay
@@ -15,8 +14,6 @@
 #undef Font
 #undef Display
 
-=======
->>>>>>> .r8093
 using namespace Upp;
 
 String FileName()
diff --git a/uppdev/cpp/main.cpp b/uppdev/cpp/main.cpp
index 98d5ac0ce..1b1eca5ac 100644
--- a/uppdev/cpp/main.cpp
+++ b/uppdev/cpp/main.cpp
@@ -64,6 +64,7 @@ CONSOLE_APP_MAIN
 //	Test("C:/OpenSSL-Win32/include/openssl/ssl.h");
 //	Test("C:/Program Files/Microsoft SDKs/Windows/v7.1/Include/WinBase.h");
 //	Test("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Vc\\Include\\string.h");
+	Test("C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/include/vector");
 	return;
 	Cpp x;
 	x.filedir = GetFileFolder(GetDataFile("x"));