Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts: src/main/java/info/bukova/isspst/AppInitListener.java src/main/resources/hibernate.cfg.xml
This commit is contained in:
@@ -18,5 +18,7 @@
|
||||
<mapping class="info.bukova.isspst.data.JobMapping"></mapping>
|
||||
<mapping class="info.bukova.isspst.data.NumberSeries"></mapping>
|
||||
<mapping class="info.bukova.isspst.data.Requirement"></mapping>
|
||||
<mapping class="info.bukova.isspst.data.Workflow"></mapping>
|
||||
<mapping class="info.bukova.isspst.data.RequirementType"></mapping>
|
||||
</session-factory>
|
||||
</hibernate-configuration>
|
||||
Reference in New Issue
Block a user