fixed dashboard calendar

resources/views/app/dashboard.blade.php

@@ -1,8 +1,7 @@
 @extends ('layouts.template')
 
 @section('content')
-<<<<<<< HEAD
-<div class="mt-3">
+<div class="p-3">
     <div class="container m-0 mt-4">
         <div class="row">
             <div class="col-md-4">
@@ -16,22 +15,6 @@
                     <div class="card-body p-0">
                         <table class="table table-condensed table-bordered m-0">
                             <tbody>
-=======
-    <div class="p-3">
-        <div class="container m-0 mt-4">
-            <div class="row">
-                <div class="col-md-4">
-                    <div class="card">
-                        <div class="card-header">
-                            <strong>
-                                <i class="fas fa-chart-bar"></i>
-                                Key Numbers
-                            </strong>
-                        </div>
-                        <div class="card-body p-0">
-                            <table class="table table-condensed table-bordered m-0">
-                                <tbody>
->>>>>>> 8a6acabd0b62f0eb47602d7d497e73c55fec82d5
                                 <tr>
                                     <th>{{$keyNumbers['totalPatients']}}</th>
                                     <th>Total patients</th>