Compare commits
No commits in common. "main" and "mergeconf2" have entirely different histories.
main
...
mergeconf2
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue