fix conflicts.

2015-02-26 07:42:24 -06:00
parent 73e1c71e70 4929781b95
commit 338f5f1cce
5 changed files with 19 additions and 8 deletions
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -18,7 +18,7 @@
                        </div>
                    @endif

-                    <form class="form-horizontal" role="form" method="POST" action="/auth/register">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/auth/register') }}">
                        <input type="hidden" name="_token" value="{{ csrf_token() }}">

                        <div class="form-group">