I have a file to which I do a git show plus the short SHA value, and it throws me the following:
diff --git a/inc/ticket.class.php b/inc/ticket.class.php
index 1108eac..cf68362 100644
--- a/inc/ticket.class.php
+++ b/inc/ticket.class.php
@@ -3406,7 +3406,7 @@ class Ticket extends CommonITILObject {
//$('#itilcategories_id').select2({
$('#subsub').select2({
- width: '230px',
+ width: '330px',^M
closeOnSelect: false,
dropdownAutoWidth: false,
quietMillis: 100,
@@ -3495,7 +3495,7 @@ class Ticket extends CommonITILObject {
}
$('#sub').select2({
- width: '230px',
+ width: '330px',^M
closeOnSelect: false,
dropdownAutoWidth: false,
quietMillis: 100,
@@ -3512,7 +3512,7 @@ class Ticket extends CommonITILObject {
//$('#subsub').select2({
$('#itilcategories_id').select2({
- width: '230px',
+ width: '330px',^M
closeOnSelect: false,
dropdownAutoWidth: false,
quietMillis: 100,
@@ -5077,7 +5077,7 @@ class Ticket extends CommonITILObject {
echo "<div id='content$rand_text'>";
if ($CFG_GLPI['use_rich_text'] || $canupdate) {
- echo "<textarea id='$content_id' name='content'
style='width:100%' row
s='$rows'>".
+ echo "<textarea id='$content_id' name='content' style='width:90%' rows ='$rows'>".^M
$this->fields["content"]."</textarea></div>";
if (!$CFG_GLPI["use_rich_text"]) {
echo Html::scriptBlock("$(document).ready(function() {
$('#$content _id').autogrow(); });");
I have several changes in the same file, which when I review the modified part I see that it has several HEADs
$('#subsub').select2({
<<<<<<< HEAD
<<<<<<< HEAD
width: '200px',
=======
width: '330px',
>>>>>>> b0842b9... casos 3 resueltos 290, 291
=======
width: '230px',
29026cd ... cases resolved 3 276,217,288,287,286 closeOnSelect: false, dropdownAutoWidth: false, quietMillis: 100, minimumResultsForSearch: 50,
Does anyone know how I can choose only one change and that everything is in order ?, Thanks in advance.