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

Unused Use Statements +1 added lines, -5 removed lines

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

Indentation +1 added lines, -5 removed lines

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

Switch Indentation +1 added lines, -5 removed lines

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

Spacing +4 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 
         // call the setup function inside this closure to also have the request there
         // this way, developers can use things stored in session (auth variables, etc)
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->setup();
 
             return $next($request);
@@ -56,7 +56,7 @@ 
         $this->data['title'] = ucfirst($this->crud->entity_name_plural);
 
         // get all entries if AJAX is not enabled
-        if (! $this->data['crud']->ajaxTable()) {
+        if (!$this->data['crud']->ajaxTable()) {
             $this->data['entries'] = $this->data['crud']->getEntries();
         }
 
@@ -211,7 +211,7 @@ 
 
         return $this->crud->delete($id);
     }
-<<<<<<< HEAD
+<< << <<< HEAD
 
     /**
      *  Reorder the items in the database using the Nested Set pattern.
@@ -353,8 +353,4 @@ 
              }
          }
 
-         return $response;
-     }
-=======
->>>>>>> master
-}
+         return $response
\ No newline at end of file

Braces +1 added lines, -5 removed lines

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

Upper-Lower-Casing +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
-];

Unused Use Statements -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
-];

Indentation -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
-];

Switch Indentation -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
-];

Spacing +1 added lines, -13 removed lines

@@ -109,16 +109,4 @@
     'external_link' => 'External link',
     '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
-];
+<< << <<< HEAD

Braces -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
-];

Upper-Lower-Casing -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
-];