Skip to content
Snippets Groups Projects
Commit af92e084 authored by Karin Pettersen's avatar Karin Pettersen
Browse files

Merge branch 'master' of git.gvk.idi.ntnu.no:mesji/bacheloroppgave_2022 into Karins_branch 

 Conflicts:
	src/main/java/com/application/DataBase/DB.java
	target/classes/com/application/Credentials.class
	target/classes/com/application/DataBase/DB.class
	target/classes/com/application/Main.class
parents a7a00582 be2a6836
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 94 additions and 16 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment