From 346691c298e008a8e9df49dd42e068fa7140013e Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Tue, 23 Oct 2012 18:36:05 -0400
Subject: [PATCH] Fix the merge for forge

---
 mcp_merge.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mcp_merge.cfg b/mcp_merge.cfg
index e9d1031377..702415a91a 100644
--- a/mcp_merge.cfg
+++ b/mcp_merge.cfg
@@ -1,6 +1,6 @@
 >ou
->iZ
->xD
+>iz
+>xd
 >xa
 >anh
 >anm
@@ -17,4 +17,4 @@
 <hr
 <hs
 <ht
-<hu
\ No newline at end of file
+<hu