resolve conflicts

2017-05-23 12:13:44 -05:00 · 2017-05-23 12:13:44 -05:00 · 398b7062e0
commit 398b7062e0
parent c383156c42 4dc60c4b1a
18 changed files with 244 additions and 81 deletions
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@ -820,4 +820,4 @@ a#forgotpassword {
 }
 .form-300{
    width: 300px;
-}
+}
--- a/datacenterlight/static/datacenterlight/js/form.js
+++ b/datacenterlight/static/datacenterlight/js/form.js