ok
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01
tabel UnitKerja
tabel riwayat pendidikan
Update tabel riwayat
table RiwayatJabatan
punya bana
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01.git
ok
fix konfigurasi database
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01

Conflicts:
	src/main/java/id/go/kemdikbud/tandajasa/domain/UnitKerja.java
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01

Conflicts:
	src/main/resources/tandajasa-ctx.xml
Merge branch 'master' of https://github.com/artivisi/training-web-basic-2014-01

Conflicts:
	src/main/resources/tandajasa-ctx.xml
fix error
refactor, ganti akses database dari jdbc menjadi hibernate
Merge branch 'master' of github.com:artivisi/training-web-basic-2014-01
Revert "push"

This reverts commit e43a019756da4f0cad7ba8af2e74a624799977d1.
Revert "tes"

This reverts commit b286066b7c78a9071d0623a0e048b85c3fa818ee.
Revert "s"

This reverts commit 7cb226d0a7c178bb7d7ef293c2f238fea0c810c4.