resolved conflicts

docker/statistics/Modules/ClinicalData/Resources/views/districts/edit.blade.php

@@ -0,0 +1,38 @@
+@extends('layouts.main')
+
+@section('title', '| Districts')
+
+@section('content')
+
+    <div class="row bg-title">
+        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
+            <h4 class="page-title">{{ __('districts.edit_district') }}</h4>
+        </div>
+        <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+            <ol class="breadcrumb">
+                <li><a href="{{ route('home') }}">{{ __('districts.dashboard') }}</a></li>
+                <li><a href="/districts/">{{ __('districts.districts') }}</a></li>
+                <li class="active">{{ __('districts.edit_district') }}</li>
+            </ol>
+        </div>
+    </div>
+    @include('flash::message')
+    <div class="panel panel-default">
+        <div class="panel-heading">{{ __('districts.edit_district') }}</div>
+
+        <div class="panel-body">
+            {{ Form::model($district, ['method' => 'PUT', 'route' => ['districts.update',$district]]) }}
+
+            <div class="form-group">
+                {{ Form::label('name', __('districts.district_name'))}}
+                {{ Form::text('name', $district->name, ['class' => 'form-control compulsory']) }}
+            </div>
+
+            <div class="form-group">
+                {{ Form::submit(__('districts.save'), ['class'=>'btn btn-success pull-right col-md-4']) }}
+            </div>
+
+            {{ Form::close() }}
+        </div>
+    </div>
+@endsection