RRRRHHHH_Code

Explore

Commits

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

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