Minor adjustments

Author: caroline223

lib/rules/jsx-indent-props.js

@@ -176,17 +176,12 @@ module.exports = {
       nodes.forEach((node) => {
         const nodeIndent = getNodeIndent(node);
         if (
-<<<<<<< HEAD
           line.isUsingOperator
           && !line.currentOperator
           && indentSize !== 'first'
           && !ignoreTernaryOperator
         ) {
           nestedIndent += indentSize;
-=======
-          line.isUsingOperator && !line.currentOperator && indentSize !== 'first' && !ignoreTernaryOperator) {
-          indent += indentSize;
->>>>>>> 60971b66... Improved readability of the checkNodesIndent function within the jsx-indent-props.js file
           line.isUsingOperator = false;
         }
         if (