diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-17 14:09:46 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-21 07:46:33 +0200 |
| commit | 3015e0bca6bc2cb8beb747873fdf7b80e74d679f (patch) | |
| tree | a66ed0fe4911a3bc3244f629f8871b286b6f0a35 /src/ui_interface.h | |
| parent | 39d3f2cb40a539fff1daba3d76a6c59e932d0f0a (diff) | |
Revert "UI to alert of respend attempt affecting wallet."
This reverts commit ada5a067c75f19a724cc054286ecf2254e5dbe8f.
Conflicts:
src/qt/guiconstants.h
src/wallet.h
Diffstat (limited to 'src/ui_interface.h')
| -rw-r--r-- | src/ui_interface.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ui_interface.h b/src/ui_interface.h index a48ba237d2..b3df2b5a85 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -21,8 +21,7 @@ enum ChangeType { CT_NEW, CT_UPDATED, - CT_DELETED, - CT_GOT_CONFLICT + CT_DELETED }; /** Signals for UI communication. */ |