From 30b591afba32a78fa1e836130de532d3d9051dc9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 25 Sep 2015 12:45:41 +0100
Subject: [PATCH] Consolidate yaml

---
 eureka-first/src/main/resources/application.yml | 3 ---
 eureka-first/src/main/resources/bootstrap.yml   | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 eureka-first/src/main/resources/application.yml

diff --git a/eureka-first/src/main/resources/application.yml b/eureka-first/src/main/resources/application.yml
deleted file mode 100644
index e71e64b..0000000
--- a/eureka-first/src/main/resources/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-server:
-  port: 9001
-  
\ No newline at end of file
diff --git a/eureka-first/src/main/resources/bootstrap.yml b/eureka-first/src/main/resources/bootstrap.yml
index 348e6a0..1fdf50b 100644
--- a/eureka-first/src/main/resources/bootstrap.yml
+++ b/eureka-first/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+  port: 9001
 spring:
   application:
     name: eurekafirst