fix bad merge.

resources/views/auth/login.blade.php

@@ -49,16 +49,6 @@
                             <div class="col-md-6 col-md-offset-4">
                                 <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>
                             </div>
                         </div>
@@ -67,6 +57,5 @@
             </div>
         </div>
     </div>
->>>>>>> master
 </div>
 @endsection