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

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

diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html
index 7590dde78f..b1f6c66e9d 100644
--- a/dashboard-ui/forgotpassword.html
+++ b/dashboard-ui/forgotpassword.html
@@ -33,4 +33,4 @@
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html
index e23dd3c14a..5bd2b0b63e 100644
--- a/dashboard-ui/forgotpasswordpin.html
+++ b/dashboard-ui/forgotpasswordpin.html
@@ -32,4 +32,4 @@
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index ec0e4382b8..adabf405aa 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -196,4 +196,4 @@
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index 9649c38ed9..9a0c71cae9 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -330,3 +330,4 @@
     }
 
 })(window, jQuery);
+