Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 0 insertions, 69 deletions

diff --git a/Dozentenmodul/src/models/vm.java b/Dozentenmodul/src/models/vm.java
deleted file mode 100644
index 34f9ffaa..00000000
--- a/Dozentenmodul/src/models/vm.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package models;
-
-import java.awt.List;
-import java.util.Date;
-
-
-public class vm {
-
-	private String Laborname;
-	private String shortDesc;
-	private String longDesc;
-	private String comment;
-	private String OS;
-	private Date begin;
-	private Date end;
-	private List software;
-	
-	public static vm vl=new vm();
-	public String getLaborname() {
-		return Laborname;
-	}
-	public void setLaborname(String laborname) {
-		Laborname = laborname;
-	}
-	public String getShortDesc() {
-		return shortDesc;
-	}
-	public void setShortDesc(String shortDesc) {
-		this.shortDesc = shortDesc;
-	}
-	public String getLongDesc() {
-		return longDesc;
-	}
-	public void setLongDesc(String longDesc) {
-		this.longDesc = longDesc;
-	}
-	public String getComment() {
-		return comment;
-	}
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-	public String getOS() {
-		return OS;
-	}
-	public void setOS(String oS) {
-		OS = oS;
-	}
-	public Date getBegin() {
-		return begin;
-	}
-	public void setBegin(Date begin) {
-		this.begin = begin;
-	}
-	public Date getEnd() {
-		return end;
-	}
-	public void setEnd(Date end) {
-		this.end = end;
-	}
-	public List getSoftware() {
-		return software;
-	}
-	public void setSoftware(List software) {
-		this.software = software;
-	}
-	
-	
-}