Laravel-Backpack / CRUD

src/app/Http/Controllers/CrudController.php

Doc Comments +1 added lines, -5 removed lines

@@ -353,8 +353,4 @@
              }
          }
 
-         return $response;
-     }
-=======
->>>>>>> master
-}
+         return $response
\ No newline at end of file

src/resources/lang/en/crud.php

Doc Comments -12 removed lines

@@ -110,15 +110,3 @@
     'choose_file' => 'Choose file',
 
 <<<<<<< HEAD
-    //Unique Fields
-    'unique_error' => 'Sorry something went wrong, please check your configuration and try again',
-    'unique_field_name_missing' => 'field_name is missing from unicity check',
-    'unique_check_value_missing' => 'check_value is missing from unicity check',
-    'unique_exists' => 'already exists',
-=======
-    //Table field
-    'table_cant_add' => 'Cannot add new :entity',
-    'table_max_reached' => 'Maximum number of :max reached',
-
->>>>>>> master
-];