From 781c0dcd66d6fd1c1e498661503706460ffd5f94 Mon Sep 17 00:00:00 2001 From: Max Huang Date: Tue, 19 May 2020 20:43:47 +1000 Subject: [PATCH] Fix merge conflicts --- src/Cleave.js | 2 +- src/Cleave.react.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cleave.js b/src/Cleave.js index fc84440c..37f3412d 100644 --- a/src/Cleave.js +++ b/src/Cleave.js @@ -307,7 +307,7 @@ Cleave.prototype = { if (pps.prefix) { if (pps.tailPrefix) { value = value + pps.prefix; - } else if(value !== pps.prefix) { + } else { value = pps.prefix + value; } diff --git a/src/Cleave.react.js b/src/Cleave.react.js index ca9b3fac..58d468dc 100644 --- a/src/Cleave.react.js +++ b/src/Cleave.react.js @@ -359,7 +359,7 @@ var cleaveReactClass = CreateReactClass({ if (pps.prefix) { if (pps.tailPrefix) { value = value + pps.prefix; - } else if (value !== pps.prefix) { + } else { value = pps.prefix + value; }