Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ofreyssinet-ledger committed Nov 26, 2021
1 parent b6a7b92 commit ac283e7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/components/CurrencyInput.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
import React, { PureComponent } from "react";
import { TextInput, StyleSheet, View, Dimensions } from "react-native";
import { StyleSheet, View, Dimensions } from "react-native";
import { connect } from "react-redux";
import { BigNumber } from "bignumber.js";

Expand All @@ -16,6 +16,7 @@ import type { Unit } from "@ledgerhq/live-common/lib/types";
import { localeSelector } from "../reducers/settings";
import getFontStyle from "./LText/getFontStyle";
import { withTheme } from "../colors";
import TextInput from "./FocusedTextInput";

function format(
unit: Unit,
Expand Down

0 comments on commit ac283e7

Please sign in to comment.