From 80866d488491385fa3bde4c875b2bdf207dc9f97 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 7 Feb 2011 16:02:46 +0100 Subject: Remove dead code and one unused file --- xmerge/source/activesync/XMergeSync.rc | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'xmerge') diff --git a/xmerge/source/activesync/XMergeSync.rc b/xmerge/source/activesync/XMergeSync.rc index b355bcad7adc..3e9d24dd9207 100644 --- a/xmerge/source/activesync/XMergeSync.rc +++ b/xmerge/source/activesync/XMergeSync.rc @@ -2,20 +2,6 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -<<<<<<< XMergeSync.rc -// #include "afxres.h" -======= -//#include "afxres.h" ->>>>>>> 1.1.12.1 - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - ///////////////////////////////////////////////////////////////////////////// // English (Ireland) resources -- cgit