removed end tags conflict line.

forgot about it when merging

	modified:   core/java/android/provider/Settings.java