not needed

monkstone · monkstone · commit 78504aea38f8 · 2016-10-02T06:41:07.000+01:00
diff --git a/src/monkstone/MathToolModule.java b/src/monkstone/MathToolModule.java
@@ -167,17 +167,10 @@ public static IRubyObject norm_strict(ThreadContext context, IRubyObject recv, I
         double max = Math.max(start, stop);
         double min = Math.min(start, stop);
         if (value < min) {
-<<<<<<< HEAD
-            value = min;
-        }
-        if (value > max) {
-            value = max;
-=======
             return mapMt(context, min, start, stop, 0, 1.0);
         }
         if (value > max) {
             return mapMt(context, max, start, stop, 0, 1.0);
->>>>>>> b501fc57c07166463e8cab84e4ca69a325f6508e
         }
         return mapMt(context, value, start, stop, 0, 1.0);
     }

Original file line number	Diff line number	Diff line change
`@@ -167,17 +167,10 @@ public static IRubyObject norm_strict(ThreadContext context, IRubyObject recv, I`
`167`	`167`	`double max = Math.max(start, stop);`
`168`	`168`	`double min = Math.min(start, stop);`
`169`	`169`	`if (value < min) {`
`170`		`-<<<<<<< HEAD`
`171`		`- value = min;`
`172`		`- }`
`173`		`- if (value > max) {`
`174`		`- value = max;`
`175`		`-=======`
`176`	`170`	`return mapMt(context, min, start, stop, 0, 1.0);`
`177`	`171`	`}`
`178`	`172`	`if (value > max) {`
`179`	`173`	`return mapMt(context, max, start, stop, 0, 1.0);`
`180`		`->>>>>>> b501fc57c07166463e8cab84e4ca69a325f6508e`
`181`	`174`	`}`
`182`	`175`	`return mapMt(context, value, start, stop, 0, 1.0);`
`183`	`176`	`}`