From e4bd2fbead649f4a370c3b479ea9d43d67093c40 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Sep 2015 13:30:39 -0400
Subject: [PATCH] update merge

---
 dashboard-ui/forgotpassword.html    | 2 +-
 dashboard-ui/forgotpasswordpin.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html
index b1f6c66e9d..7590dde78f 100644
--- a/dashboard-ui/forgotpassword.html
+++ b/dashboard-ui/forgotpassword.html
@@ -33,4 +33,4 @@
         </div>
     </div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html
index 53e078a7b4..e23dd3c14a 100644
--- a/dashboard-ui/forgotpasswordpin.html
+++ b/dashboard-ui/forgotpasswordpin.html
@@ -12,7 +12,7 @@
 
                 <div style="text-align: left;">
                     <h2>${HeaderPasswordReset}</h2>
-                    
+
                     <div>
                         <paper-input type="text" id="txtPin" label="${LabelPasswordRecoveryPinCode}" autocomplete="off" required="required"></paper-input>
                     </div>
@@ -32,4 +32,4 @@
         </div>
     </div>
 </body>
-</html>
+</html>
\ No newline at end of file