"app/git@sites.upe.br:walter.felipe/submeta.git" did not exist on "b65e96c38d139b89841c4b411c1d969cce497ea4"
Commit 63792b7d authored by Edgarvital's avatar Edgarvital
Browse files

Resolução de conflito

parents daea650d f6261e2e
...@@ -76,7 +76,6 @@ class UsuarioSeeder extends Seeder ...@@ -76,7 +76,6 @@ class UsuarioSeeder extends Seeder
]); ]);
DB::table('users')->insert([ DB::table('users')->insert([
'name'=>'Participante1', 'name'=>'Participante1',
'email'=>'part1@ufrpe.br', 'email'=>'part1@ufrpe.br',
'password'=>Hash::make('12345678'), 'password'=>Hash::make('12345678'),
......
...@@ -62,15 +62,18 @@ ...@@ -62,15 +62,18 @@
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option> <option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@elseif($funcao->nome != "Consultor" && $funcao->nome != "Pesquisador" && $funcao->nome != "Voluntário") @elseif($funcao->nome != "Consultor" && $funcao->nome != "Pesquisador" && $funcao->nome != "Voluntário")
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option> <option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif @endif
@else @else
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option> <option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif @endif
--> -->
@endforeach @endforeach
......
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