Commit 4881c876 authored by Jasper Koehorst's avatar Jasper Koehorst
Browse files

git conflict

parent 0962934a
Pipeline #38038 passed with stage
in 2 minutes and 43 seconds
......@@ -12,14 +12,4 @@ public class RUNSET{
public void setRUN(ArrayList<RUN> rUN) {
this.rUN = rUN; }
ArrayList<RUN> rUN = new ArrayList<>();
}
=======
public class RUNSET{
@JsonProperty("RUN")
public RUN getRUN() {
return this.rUN; }
public void setRUN(RUN rUN) {
this.rUN = rUN; }
RUN rUN;
}
>>>>>>> 3d2e7bc368880c32d40198f9fb320f8e742a6eea
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment