From dddd604f7be1170c91c31af87225f4b0a4a0ebcc Mon Sep 17 00:00:00 2001
From: orangemug <info@orangemug.co.uk>
Date: Sat, 26 Oct 2019 17:41:56 +0100
Subject: [PATCH] Removed left over conflict markers and set default.

---
 src/components/inputs/NumberInput.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/inputs/NumberInput.jsx b/src/components/inputs/NumberInput.jsx
index 383e875..890ea49 100644
--- a/src/components/inputs/NumberInput.jsx
+++ b/src/components/inputs/NumberInput.jsx
@@ -113,7 +113,6 @@ class NumberInput extends React.Component {
   }
 
   render() {
-<<<<<<< HEAD
     if(
       this.props.hasOwnProperty("min") && this.props.hasOwnProperty("max") &&
       this.props.min !== undefined && this.props.max !== undefined &&
@@ -149,7 +148,7 @@ class NumberInput extends React.Component {
           spellCheck="false"
           className="maputnik-number"
           placeholder={this.props.default}
-          value={this.state.dirtyValue}
+          value={this.state.dirtyValue === undefined ? "" : this.state.dirtyValue}
           onChange={e => {
             this.changeValue(e.target.value)
           }}