From 124124288487a89e743f81559798dfceeee065c4 Mon Sep 17 00:00:00 2001 From: koen Date: Fri, 7 Nov 2014 13:50:23 +0100 Subject: [PATCH 1/2] fix #965 : ClientProxyGenerator fails with GWT 2.7 --- .../src/org/restlet/rebind/ClientProxyGenerator.java.gwt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt b/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt index 08a8f2d23c..21b7a47a61 100644 --- a/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt +++ b/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt @@ -837,6 +837,10 @@ public class ClientProxyGenerator extends com.google.gwt.core.ext.Generator { return result; } +<<<<<<< HEAD +======= + +>>>>>>> fix #965 : ClientProxyGenerator fails with GWT 2.7 /** * Returns the writer used for the content of the proxy class. * From 6705122c0858af67fa06ec3ef24eca04d2e397f0 Mon Sep 17 00:00:00 2001 From: koen Date: Wed, 25 Feb 2015 12:05:06 +0100 Subject: [PATCH 2/2] Revert "fix #965 : ClientProxyGenerator fails with GWT 2.7" This reverts commit 124124288487a89e743f81559798dfceeee065c4. --- .../src/org/restlet/rebind/ClientProxyGenerator.java.gwt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt b/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt index 21b7a47a61..08a8f2d23c 100644 --- a/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt +++ b/modules/org.restlet/src/org/restlet/rebind/ClientProxyGenerator.java.gwt @@ -837,10 +837,6 @@ public class ClientProxyGenerator extends com.google.gwt.core.ext.Generator { return result; } -<<<<<<< HEAD -======= - ->>>>>>> fix #965 : ClientProxyGenerator fails with GWT 2.7 /** * Returns the writer used for the content of the proxy class. *