From cfce59d6dc120848624e105614575ae0f48af81b Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Mon, 29 Feb 2016 14:20:13 +0100
Subject: merge

---
 client/partials/home/main.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'client/partials/home/main.html')

diff --git a/client/partials/home/main.html b/client/partials/home/main.html
index 7a5045a..37638d3 100644
--- a/client/partials/home/main.html
+++ b/client/partials/home/main.html
@@ -1,8 +1,11 @@
- <div class="panel panel-default">
+ <div class="panel panel-default" ng-controller="homeCtrl">
     <div class="panel-heading">
         Home 
     </div>
     <div class="panel-body">
         Main Content
+		<button ng-click="raiseShowMachineDetailsEvent()" > Show Machine details</button>
+		<div id="test">
+		</div>
     </div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3