From fe9eb89ebc1b3c33cbac00a3fa095a14faef9113 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:28:01 +0200
Subject: 5.22

---
 synchronization.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'synchronization.h')

diff --git a/synchronization.h b/synchronization.h
index 75612d8b..bc6b79db 100644
--- a/synchronization.h
+++ b/synchronization.h
@@ -34,7 +34,7 @@ public:
 
     int getConflict() const { return static_cast<int>(conflictMsgs.size()); }
 
-    typedef std::vector<std::pair<Zstring, std::wstring> > ConflictTexts; // Pair(filename/conflict text)
+    typedef std::vector<std::pair<Zstring, std::wstring>> ConflictTexts; // Pair(filename/conflict text)
     const ConflictTexts& getConflictMessages() const { return conflictMsgs; }
 
     Int64 getDataToProcess() const { return dataToProcess; }
-- 
cgit