RRRRHHHH_Code

Explore

Commits

Diff Revisions 998673 ... vs c92b61 ... for ruralHouses client/src/gui/ModifyOfferGUI.java

		@@ -75,6 +75,7 @@
75	75		this.setSize(new Dimension(513, 433));
76	76		this.setTitle("Set availability");
77	77
	78	+	<<<<<<< HEAD
78	79
79	80		try {
80	81		om = (OfferInterface) Naming
		@@ -90,6 +91,8 @@
90	91		} catch (RemoteException e1) {
91	92		e1.printStackTrace();
92	93		}
	94	+	=======
	95	+	>>>>>>> 25898b619dd708c9f15a44200b545cac11404b73
93	96
94	97		jComboBox1 = new JComboBox<RuralHouse>(Hlist);
95	98