Changeset 86 in josm for .settings

Timestamp:

2006-04-21T14:31:51+02:00 (19 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

Location:

.settings

Files:

• org.eclipse.jdt.core.prefs (modified) (2 diffs)
• org.eclipse.jdt.ui.prefs (modified) (1 diff)

.settings/org.eclipse.jdt.core.prefs

@@ -1 @@
-#Mon Apr 03 21:11:54 CEST 2006
+#Fri Apr 21 12:51:47 CEST 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
@@ -68 +68 @@
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

.settings/org.eclipse.jdt.ui.prefs

@@ -1 @@
-#Mon Apr 03 21:08:35 CEST 2006
+#Fri Apr 21 12:51:47 CEST 2006
 eclipse.preferences.version=1
 formatter_profile=_josm