From: Manuel Carrasco MoƱino Date: Mon, 23 Dec 2013 18:44:30 +0000 (+0100) Subject: Fix merge issue X-Git-Tag: gwtquery-project-1.4.3~44^2~5^2^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7955d166c4f92187e6541fd6046650ccdcbf71a8;p=gwtquery.git Fix merge issue --- diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java index dea15355..8ec7cc7a 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java @@ -171,6 +171,6 @@ public class PromiseReqBuilder extends DeferredPromiseImpl implements RequestCal * Using violator pattern to use protected constructor */ private native Request createRequestVltr(XMLHttpRequest rq, int ms, RequestCallback cb) /*-{ - return @com.google.gwt.http.client.Request::new(Lcom/google/gwt/xhr/client/XMLHttpRequest;ILcom/google/gwt/http/client/RequestCallback;)(rq, + return @com.google.gwt.http.client.Request::new(Lcom/google/gwt/xhr/client/XMLHttpRequest;ILcom/google/gwt/http/client/RequestCallback;)(rq,cb); }-*/; }