diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:55 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:55 +0200 |
| commit | c4182431ac7d9d306fdd2267e082fa4cec6fec2c (patch) | |
| tree | 865cca543c062b7af2586f85cee19f9af4e7614d /synchronization.h | |
| parent | 5.11 (diff) | |
| download | FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.tar.gz FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.tar.bz2 FreeFileSync-c4182431ac7d9d306fdd2267e082fa4cec6fec2c.zip | |
5.12
Diffstat (limited to 'synchronization.h')
| -rw-r--r-- | synchronization.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synchronization.h b/synchronization.h index 3a3dcec1..e9d15e29 100644 --- a/synchronization.h +++ b/synchronization.h @@ -41,7 +41,6 @@ public: size_t getRowCount() const { return rowsTotal; } private: - //static const size_t MAX_CONFLICTS = 3; void init(); void recurse(const HierarchyObject& hierObj); @@ -53,7 +52,6 @@ private: int createLeft, createRight; int updateLeft, updateRight; int deleteLeft, deleteRight; - // int conflict; ConflictTexts conflictMsgs; //conflict texts to display as a warning message Int64 dataToProcess; size_t rowsTotal; |