Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad merge.

This commit is contained in:
Taylor Otwell 2015-02-26 07:45:20 -06:00
parent 338f5f1cce
commit 5e71bcae3c
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
resources/views/auth/login.blade.php
View File

@ -49,8 +49,7 @@
<div class="col-md-6 col-md-offset-4"> <div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary">Login</button> <button type="submit" class="btn btn-primary">Login</button>
<<<<<<< HEAD <a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
<a class="btn btn-link" href="/password/email">Forgot Your Password?</a>
</div> </div>
</div> </div>
</form> </form>
@ -58,15 +57,5 @@
</div> </div>
</div> </div>
</div> </div>
=======
<a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
>>>>>>> master
</div> </div>
@endsection @endsection