An error occurred while retrieving target projects.

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source 7

Added test class for accountHandler · 5e0b0da0
Karin Pettersen authored May 15, 2022

5e0b0da0
Added test class for accountHandler · a8d78543
Karin Pettersen authored May 15, 2022

a8d78543
Added test class for accountHandler · 4cd88e39
Karin Pettersen authored May 15, 2022

4cd88e39
Added test class for accountHandler · d017e351
Karin Pettersen authored May 15, 2022

d017e351
Added feature to press enter on keyboard when logging in · 8a012211
Karin Pettersen authored May 15, 2022

8a012211

Merge remote-tracking branch 'origin/Karins_branch' into Karins_branch · a9097349

Karin Pettersen authored May 15, 2022

# Conflicts:
#	target/classes/com/application/DB/AccountHandler.class
#	target/classes/com/application/DB/HelpingFunctions.class
#	target/classes/com/application/GUI/LineChartFunctionality.class
#	target/classes/com/application/GUI/PopUpWindows/InputPopup.class
#	target/classes/com/application/GUI/PopUpWindows/LoginPopup.class

a9097349

Merge branch 'Karins_branch' into 'master' · a80e2309
Karin Pettersen authored May 15, 2022
```
Karins branch

See merge request mesji/bacheloroppgave_2022!55
```
a80e2309

Source

Target

Files