Delete .classpath
Delete .project
Delete org.eclipse.core.resources.prefs
Delete org.eclipse.jdt.core.prefs
Delete org.eclipse.m2e.core.prefs
Delete org.hibernate.eclipse.console.prefs
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git
Merge branch 'master' of https://github.com/shoeIT/hiwayDB.git