Manual merge

2018-04-13 18:47:42 +03:00
parent f796b1fb8f
commit 69c24cd06e
2 changed files with 2 additions and 2 deletions
--- a/src/chain.h
+++ b/src/chain.h
@@ -177,7 +177,7 @@ public:

    //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
    uint32_t nSequenceId;
-    int8_t notaryid; uint8_t pubkey33[33];
+    int8_t notaryid; uint8_t pubkey33[33],didinit;
    
    void SetNull()
    {