Skip to content

Commit

Permalink
v0.6.0-beta2 conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kaloudis committed Jan 28, 2022
2 parents e49f1f9 + c8c06e5 commit 969ff67
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions stores/InvoicesStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import querystring from 'querystring-es3';
import hashjs from 'hash.js';
import Invoice from './../models/Invoice';
import SettingsStore from './SettingsStore';
import Base64Utils from './../utils/Base64Utils';
import RESTUtils from './../utils/RESTUtils';

export default class InvoicesStore {
Expand Down
1 change: 1 addition & 0 deletions views/UTXOs/CoinControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { localeString } from './../../utils/LocaleUtils';
import RESTUtils from './../../utils/RESTUtils';
import { themeColor } from './../../utils/ThemeUtils';

import SettingsStore from './../../stores/SettingsStore';
import UTXOsStore from './../../stores/UTXOsStore';

interface CoinControlProps {
Expand Down

0 comments on commit 969ff67

Please sign in to comment.