Merged most recent master in, #story[1092]

2017-08-17 13:23:55 +12:00
parent 7546c65893
commit 2e9c6fe593
4 changed files with 22 additions and 8 deletions
@@ -8,6 +8,8 @@

 package shared.xml.Race;

+import mock.model.collider.Collider;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -37,7 +39,7 @@ import javax.xml.bind.annotation.XmlType;
 */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
-public class XMLMark {
+public class XMLMark{

    @XmlAttribute(name = "SeqId")
    protected Integer seqId;