Compare commits

..

No commits in common. "main" and "mergeconf2" have entirely different histories.

1 changed files with 2 additions and 6 deletions

View File

@ -8,12 +8,8 @@ public class UI {
private Banksystem bs;
Scanner sc = new Scanner(System.in);
int change = 2;
int conflict = 25;
int change = 0;
int conflict = 0;
public UI(Banksystem bs) {
this.bs = bs;