annotate .settings/org.eclipse.core.resources.prefs @ 341:75c452fdd76a

Merging state not detected when there's no conflicts to resolve (no merge/state file)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 17 Nov 2011 07:04:58 +0100
parents 868a5a6e9f93
children
rev   line source
149
868a5a6e9f93 Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff changeset
1 #Thu Feb 24 18:49:36 CET 2011
868a5a6e9f93 Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff changeset
2 eclipse.preferences.version=1
868a5a6e9f93 Junit sources archive added;
Alexander Kitaev <kitaev@gmail.com>
parents:
diff changeset
3 encoding/<project>=UTF-8