From 15d49227c1287dd0fb4d32bde98cb3781f844d41 Mon Sep 17 00:00:00 2001
From: John Wellbelove <smartgit@wellbelove.co.uk>
Date: Wed, 13 Feb 2019 11:18:58 +0100
Subject: [PATCH] Merge branch 'development' into hot-fix/unordered_map_erase

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
---
 include/etl/atomic/atomic_std.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/etl/atomic/atomic_std.h b/include/etl/atomic/atomic_std.h
index e2e7fea9..7a28a930 100644
--- a/include/etl/atomic/atomic_std.h
+++ b/include/etl/atomic/atomic_std.h
@@ -600,6 +600,6 @@ namespace etl
   typedef std::atomic<ptrdiff_t>           atomic_ptrdiff_t;
   typedef std::atomic<intmax_t>            atomic_intmax_t;
   typedef std::atomic<uintmax_t>           atomic_uintmax_t;
-};
+}
 
 #endif