Matthew Dempsky has uploaded a new change for review.
https://gwt-review.googlesource.com/2664
Change subject: Remove git conflict markers.
......................................................................
Remove git conflict markers.
Change-Id: Ia6cddf1f7d0a4ae8f70f0757d8b731c98b70c09c
---
M user/src/com/google/gwt/user/client/Window.java
1 file changed, 0 insertions(+), 7 deletions(-)
diff --git a/user/src/com/google/gwt/user/client/Window.java
b/user/src/com/google/gwt/user/client/Window.java
index 71f1801..de037fa 100644
--- a/user/src/com/google/gwt/user/client/Window.java
+++ b/user/src/com/google/gwt/user/client/Window.java
@@ -220,18 +220,11 @@
}
/**
-<<<<<<< HEAD
- * Returns a Map of the URL query parameters for the host page; since
- * changing the map would not change the window's location, the map
returned
- * is immutable.
- *
-=======
* Returns an immutable Map of the URL query parameters for the host
page
* at the time this method was called.
* Any changes to the window's location will be reflected in the result
* of subsequent calls.
*
->>>>>>> 7c80e9495a6c632e391e6131ae487ff0a16635a7
* @return a map from URL query parameter names to a list of values
*/
public static Map<String, List<String>> getParameterMap() {
--
To view, visit https://gwt-review.googlesource.com/2664
To unsubscribe, visit https://gwt-review.googlesource.com/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6cddf1f7d0a4ae8f70f0757d8b731c98b70c09c
Gerrit-PatchSet: 1
Gerrit-Project: gwt
Gerrit-Branch: master
Gerrit-Owner: Matthew Dempsky <[email protected]>
--
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
---
You received this message because you are subscribed to the Google Groups "Google Web Toolkit Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
