Merge branch 'kevin_local' into 'dennis_local'
# Conflicts: # .gitignore # .idea/misc.xml
No related branches found
No related tags found
Showing
- .idea/dbnavigator.xml 462 additions, 0 deletions.idea/dbnavigator.xml
- .idea/modules.xml 8 additions, 0 deletions.idea/modules.xml
- notenmanager.iml 11 additions, 0 deletionsnotenmanager.iml
- src/Calcuable.java 6 additions, 0 deletionssrc/Calcuable.java
- src/Course.java 43 additions, 0 deletionssrc/Course.java
- src/CoursesOfStudy.java 26 additions, 0 deletionssrc/CoursesOfStudy.java
- src/Enrollment.java 15 additions, 0 deletionssrc/Enrollment.java
- src/Lecturer.java 22 additions, 0 deletionssrc/Lecturer.java
- src/Main.java 46 additions, 0 deletionssrc/Main.java
- src/Student.java 92 additions, 0 deletionssrc/Student.java
- src/UniversityMember.java 68 additions, 0 deletionssrc/UniversityMember.java
- src/enumeration/BachelorDegree.java 15 additions, 0 deletionssrc/enumeration/BachelorDegree.java
- src/enumeration/BachelorSemester.java 25 additions, 0 deletionssrc/enumeration/BachelorSemester.java
- src/enumeration/CourseType.java 16 additions, 0 deletionssrc/enumeration/CourseType.java
- src/enumeration/ExamType.java 18 additions, 0 deletionssrc/enumeration/ExamType.java
- src/enumeration/FieldOfStudy.java 7 additions, 0 deletionssrc/enumeration/FieldOfStudy.java
- src/enumeration/Gender.java 15 additions, 0 deletionssrc/enumeration/Gender.java
- src/enumeration/Mark.java 26 additions, 0 deletionssrc/enumeration/Mark.java
- src/enumeration/Status.java 15 additions, 0 deletionssrc/enumeration/Status.java
Loading
Please register or sign in to comment