Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git Conflicts: src/Main/Profession.java
joh13010 · Feb 28, 2017 · 47babf8 · 47babf8
2 parents 2438808 + d2e986c
commit 47babf8
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 26 deletions.
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
diff --git a/bin/model/Profession.class b/bin/model/Profession.class
diff --git a/bin/view/Window.class b/bin/view/Window.class
diff --git a/src/Main/Main.java b/src/Main/Main.java
diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
@@ -0,0 +1,5 @@
+package controller;
+
+public class Cashflow {
+
+}
diff --git a/src/Main/die.java → src/model/Die.java b/src/Main/die.java → src/model/Die.java
@@ -1,3 +1,4 @@
+package model;
 import java.util.Random;
 
 

diff --git a/src/model/Profession.java b/src/model/Profession.java
@@ -0,0 +1,20 @@
+package model;
+
+public class Profession
+{
+
+	public String profName;
+	public int salary;
+	public int expenses;
+	public int savings;
+	public int liabilities;
+
+
+
+
+
+
+
+
+
+}
diff --git a/src/model/Professions.java b/src/model/Professions.java
@@ -0,0 +1 @@
+
diff --git a/src/view/Window.java b/src/view/Window.java
@@ -0,0 +1,5 @@
+package view;
+
+public class Window {
+
+}
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		package model;
		import java.util.Random;


Expand Down