Removing duplicate entries from User.gwt.xml that were added in r9976 due to an undetected merge conflict with r9879, in which the entries were sorted alphabetically.
Review at http://gwt-code-reviews.appspot.com/1422801
Review by: pdr@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10013 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/User.gwt.xml b/user/src/com/google/gwt/user/User.gwt.xml
index 78c8bff..2e304f7 100644
--- a/user/src/com/google/gwt/user/User.gwt.xml
+++ b/user/src/com/google/gwt/user/User.gwt.xml
@@ -27,6 +27,7 @@
<inherits name="com.google.gwt.layout.Layout"/>
<inherits name="com.google.gwt.media.Media"/>
<inherits name="com.google.gwt.resources.Resources"/>
+ <inherits name="com.google.gwt.safecss.SafeCss" />
<inherits name="com.google.gwt.safehtml.SafeHtml" />
<inherits name="com.google.gwt.storage.Storage" />
<inherits name="com.google.gwt.text.Text"/>
@@ -54,15 +55,6 @@
<inherits name="com.google.gwt.user.SplitPanel"/>
<inherits name="com.google.gwt.user.TextBox"/>
<inherits name="com.google.gwt.user.Tree"/>
- <inherits name="com.google.gwt.user.Hyperlink"/>
- <inherits name="com.google.gwt.user.FileUpload"/>
- <inherits name="com.google.gwt.user.ResizeLayoutPanel"/>
- <inherits name="com.google.gwt.user.ScrollPanel"/>
- <inherits name="com.google.gwt.user.datepicker.DatePicker"/>
- <inherits name="com.google.gwt.user.cellview.CellView"/>
- <inherits name="com.google.gwt.safecss.SafeCss" />
- <inherits name="com.google.gwt.safehtml.SafeHtml" />
- <inherits name="com.google.gwt.storage.Storage" />
<inherits name="com.google.gwt.user.Window" />
<inherits name="com.google.gwt.widget.Widget"/>
