summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-07 16:02:46 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-07 16:02:57 +0100
commit80866d488491385fa3bde4c875b2bdf207dc9f97 (patch)
tree395e20a0fbc121910da1055747b0b1b30d6943fd /xmerge
parent080b12d9a90f2381238f3f023937443134755530 (diff)
Remove dead code and one unused file
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/activesync/XMergeSync.rc14
1 files changed, 0 insertions, 14 deletions
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