Updates for 1.2.10

Author: mondain

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.8</version>
+        <version>1.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>

src/main/java/org/red5/server/api/Red5.java

@@ -55,25 +55,21 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 1.2.9";
+    public static final String VERSION = "Red5 Server 1.2.10";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/1,2,9,0";
+    public static final String FMS_VERSION = "RED5/1,2,10,0";
 
     /**
      * Server capabilities
      */
     public static final Integer CAPABILITIES = Integer.valueOf(33);
 
     /**
-    <<<<<<< HEAD
      * Target for ChunkSize messaging in RTMP. Defaulting to 128 which is the original FMS setting, until modifying this is more
      * throughly tested.
-    =======
-     * Since 128 is the default when publish or play are called; changing this may cause unexpected issues.
-    >>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
      */
     public static int targetChunkSize = 128;