AT:Resolving conflicts
authora.theys <a.theys@localhost>
Sat, 23 Jun 2012 05:07:14 +0000 (05:07 +0000)
committera.theys <a.theys@localhost>
Sat, 23 Jun 2012 05:07:14 +0000 (05:07 +0000)
commit5ed6b47263dcec6fbb84f431cca9345c6ecf3661
tree439c1522080e0f7066671e862a7e260e9e30e013
parentf41433b9161a5e0d1c5d068134e47491c131fe2a
AT:Resolving conflicts
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar [new file with mode: 0644]