Skip to content

S
syncEnrollments
Commit 5e71bcae authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fix bad merge.

parent 338f5f1c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 12 deletions
resources/views/auth/login.blade.php
View file @ 5e71bcae
...@@ -49,16 +49,6 @@ ...@@ -49,16 +49,6 @@
<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="/password/email">Forgot Your Password?</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
=======
<a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a> <a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
</div> </div>
</div> </div>
...@@ -67,6 +57,5 @@ ...@@ -67,6 +57,5 @@
</div> </div>
</div> </div>
</div> </div>
>>>>>>> master
</div> </div>
@endsection @endsection
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment