Add a few simple merge test cases
[egit/charleso.git] / org.spearce.egit / .settings / org.eclipse.core.resources.prefs
blob78f271dbbbb57bc48864b7dbd9b2123350e2396e
1 #Mon Aug 11 16:46:35 PDT 2008
2 eclipse.preferences.version=1
3 encoding/<project>=UTF-8