Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
nosir committed May 19, 2020
1 parent c8bb41e commit 781c0dc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Cleave.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Cleave.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 781c0dc

Please sign in to comment.