diff options
| author | Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com> | 2013-12-23 19:44:30 +0100 |
|---|---|---|
| committer | Manuel Carrasco Moñino <manuel.carrasco.m@gmail.com> | 2013-12-23 19:44:30 +0100 |
| commit | 7955d166c4f92187e6541fd6046650ccdcbf71a8 (patch) | |
| tree | 8b5ec233f589959bbc73a2f84b278ed052882f4a | |
| parent | 0a9322ccb029bf6edc1f0bf01a29303fd8600614 (diff) | |
| download | gwtquery-7955d166c4f92187e6541fd6046650ccdcbf71a8.tar.gz gwtquery-7955d166c4f92187e6541fd6046650ccdcbf71a8.zip | |
Fix merge issue
| -rw-r--r-- | gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/deferred/PromiseReqBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); }-*/; } |