From ba30f8b6b4337487f0611a065976a199974eb595 Mon Sep 17 00:00:00 2001
From: kl-cruz <karol.lasonczyk@nordicsemi.no>
Date: Wed, 17 May 2017 09:12:20 +0200
Subject: [PATCH] nRF52840: Align sources after rebase

---
 .../{TARGET_NRF5_SDK13 => TARGET_NRF5}/flash_api.c             | 0
 targets/TARGET_NORDIC/TARGET_NRF5/objects.h                    | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename targets/TARGET_NORDIC/{TARGET_NRF5_SDK13 => TARGET_NRF5}/flash_api.c (100%)

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/flash_api.c
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5_SDK13/flash_api.c
rename to targets/TARGET_NORDIC/TARGET_NRF5/flash_api.c
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/objects.h b/targets/TARGET_NORDIC/TARGET_NRF5/objects.h
index 1b87a94ea6..01dd5f8090 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5/objects.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5/objects.h
@@ -81,8 +81,7 @@ struct gpio_irq_s {
     uint32_t ch;
 };
 
-struct flash_s
-{
+struct flash_s {
     uint32_t placeholder;
 };