Fixed rebase issues

This commit is contained in:
James Brooks
2014-12-01 16:46:56 +00:00
parent 7aec301ce6
commit 0fb39f34f8
6 changed files with 37 additions and 17 deletions
+3 -3
View File
@@ -41,9 +41,9 @@
<legend>Administrator Account</legend>
<div class='form-group'>
<label class='sr-only'>Username</label>
<input type='text' name='user[name]' class='form-control' placeholder='Username' value='{{ Input::old('user.name', '') }}' required />
@if($errors->has('user.name'))
<span class='text-danger'>{{ $errors->first('user.name') }}</span>
<input type='text' name='user[username]' class='form-control' placeholder='Username' value='{{ Input::old('user.username', '') }}' required />
@if($errors->has('user.username'))
<span class='text-danger'>{{ $errors->first('user.username') }}</span>
@endif
</div>
<div class='form-group'>