From 7120c9c292c0454df0569207414f6ab72fcfd999 Mon Sep 17 00:00:00 2001
From: Jamie Doornbos <jamie@threerings.net>
Date: Mon, 4 Apr 2011 20:15:48 +0000
Subject: [PATCH] Fixed conflict in generated source merge when using native
 eol-styles by allowing an optional CR before the LF ($ here did not work for
 some reason)

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6599 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/presents/tools/GeneratedSourceMerger.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java b/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
index acf12bb31..b490e9ade 100644
--- a/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
+++ b/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
@@ -125,5 +125,5 @@ public class GeneratedSourceMerger
     }
 
     protected final Pattern _sectionDelimiter =
-        Pattern.compile(" *// GENERATED (\\w+) (START|END|DISABLED)\n");
+        Pattern.compile(" *// GENERATED (\\w+) (START|END|DISABLED)\r?\n");
 }