annotate .settings/org.eclipse.core.resources.prefs @ 231:1792b37650f2

Introduced access to conflict resolution information (merge state)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 01 Jun 2011 05:44:25 +0200
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