From b2a38bde860c8a20aca6fd20e0b1a8ff9b7fb119 Mon Sep 17 00:00:00 2001
From: "Jost, Beate" <beate.jost@iais.fraunhofer.de>
Date: Thu, 24 Sep 2015 01:15:04 +0200
Subject: [PATCH] fix version number

---
 OpenRobertaParent/pom.xml                     |  4 +--
 .../simulation/simulationLogic/simulation.js  | 25 -------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/OpenRobertaParent/pom.xml b/OpenRobertaParent/pom.xml
index bf0eb647d..dffbd693b 100644
--- a/OpenRobertaParent/pom.xml
+++ b/OpenRobertaParent/pom.xml
@@ -27,8 +27,8 @@ limitations under the License.
 	<inceptionYear>2014</inceptionYear>
 	<properties>
 		<!-- the server and the crosscompiler SHOULD be compatible between(including) the following two versions of software deployed on the ROBOT -->
-		<validversionrange.From>1.3.0</validversionrange.From>
-		<validversionrange.To>1.3.0</validversionrange.To>
+		<validversionrange.From>1.3.1</validversionrange.From>
+		<validversionrange.To>1.3.1</validversionrange.To>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
 		<buildTimeStamp>${maven.build.timestamp}</buildTimeStamp>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/OpenRobertaServer/staticResources/simulation/simulationLogic/simulation.js b/OpenRobertaServer/staticResources/simulation/simulationLogic/simulation.js
index 1bf4df4f7..61f7c40bf 100644
--- a/OpenRobertaServer/staticResources/simulation/simulationLogic/simulation.js
+++ b/OpenRobertaServer/staticResources/simulation/simulationLogic/simulation.js
@@ -238,16 +238,11 @@ var SIM = (function() {
         output.right = right * MAXPOWER || 0;
 
         robot.led.mode = output.ledMode = LIGHT.getMode() || "OFF";
-<<<<<<< HEAD
         if (LIGHT.getMode() && LIGHT.getMode() == "OFF") {
             robot.led.color = output.led = "#dddddd"; // = led off
         } else {
             robot.led.color = output.led = LIGHT.getColor();
         }
-=======
-        if (LIGHT.getMode() && LIGHT.getMode() == "OFF"){robot.led.color = output.led = "#dddddd"; // = led off
-} else {robot.led.color = output.led = LIGHT.getColor();}
->>>>>>> 42c1b33c2760dfd6350113939dffefa669b4ce48
     }
 
     function setObstacle() {
@@ -364,10 +359,6 @@ var SIM = (function() {
             scene.playground.h = $(window).height() - offsetY;
             var oldScale = scale;
             scale = 1;
-<<<<<<< HEAD
-=======
-            //LOG.info($(window).width());
->>>>>>> 42c1b33c2760dfd6350113939dffefa669b4ce48
             if ($(window).width() < 768) {// extra small devices
                 scale = 0.5
             } else if ($(window).width() < 1024) {// medium and large devices     
@@ -522,7 +513,6 @@ var SIM = (function() {
         window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'] || window[vendors[x] + 'CancelRequestAnimationFrame'];
     }
 
-<<<<<<< HEAD
     if (!window.requestAnimationFrame) {
         window.requestAnimationFrame = function(callback, element) {
             var currTime = new Date().getTime();
@@ -540,19 +530,4 @@ var SIM = (function() {
             clearTimeout(id);
         };
     }
-=======
-    if (!window.requestAnimationFrame){window.requestAnimationFrame = function(callback, element) {
-        var currTime = new Date().getTime();
-        var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-        var id = window.setTimeout(function() {
-            callback(currTime + timeToCall);
-        }, timeToCall);
-        lastTime = currTime + timeToCall;
-        return id;
-    };}
-
-    if (!window.cancelAnimationFrame){window.cancelAnimationFrame = function(id) {
-        clearTimeout(id);
-    };}
->>>>>>> 42c1b33c2760dfd6350113939dffefa669b4ce48
 }());