supertoller Merge, EDIT zum Commit:
Liest in ArtikelDetailView nicht richtig ShopName und -Id aus Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s # Conflicts: # src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
No related branches found
No related tags found
Showing
- .idea/artifacts/shopInShop_war_exploded.xml 4 additions, 0 deletions.idea/artifacts/shopInShop_war_exploded.xml
- .idea/workspace.xml 303 additions, 439 deletions.idea/workspace.xml
- pom.xml 12 additions, 0 deletionspom.xml
- shopInShop.iml 4 additions, 0 deletionsshopInShop.iml
- src/main/java/org/s4s/gui/views/WarenkorbView.java 4 additions, 3 deletionssrc/main/java/org/s4s/gui/views/WarenkorbView.java
- src/main/java/org/s4s/process/control/TransactionControl.java 12 additions, 15 deletions...main/java/org/s4s/process/control/TransactionControl.java
- src/test/java/org/s4s/dao/impl/ProductSearchTest.java 6 additions, 4 deletionssrc/test/java/org/s4s/dao/impl/ProductSearchTest.java
- src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java 4 additions, 1 deletionsrc/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
- src/test/java/org/s4s/process/control/ShopControlTest.java 31 additions, 10 deletionssrc/test/java/org/s4s/process/control/ShopControlTest.java
Loading
Please register or sign in to comment