fix conflit

.idea/workspace.xml

@@ -3,16 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/void_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/void_controller.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/home/index.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/home/index.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/home/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/orders/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/payments/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/payments/show.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/sales/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
     <ignored path="$PROJECT_DIR$/components/" />
@@ -85,7 +75,45 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="420">
               <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
-              <folding />
+              <folding>
+                <marker date="1498539948000" expanded="true" signature="3450:4239" ph="do ... end" />
+                <marker date="1498539948000" expanded="true" signature="3598:4131" ph="&lt;%...%&gt;" />
+                <marker date="1498539948000" expanded="true" signature="3714:4114" ph="if ... end" />
+                <marker date="1498539948000" expanded="true" signature="4005:4027" ph="if ... end" />
+                <marker date="1498539948000" expanded="true" signature="4395:6842" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4419:6833" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4454:4539" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4571:6821" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4609:5000" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4661:4756" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4678:4738" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4713:4734" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="4819:4984" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5059:5210" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5111:5193" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5243:6180" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5313:6164" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5334:5545" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5354:5523" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5566:6144" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="5583:5749" ph="&lt;%...%&gt;" />
+                <marker date="1498539948000" expanded="true" signature="5817:6041" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="6058:6123" ph="&lt;%...%&gt;" />
+                <marker date="1498539948000" expanded="true" signature="6215:6807" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="6284:6791" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="6302:6491" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="6509:6725" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="6908:7237" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="6999:7127" ph="if ... end" />
+                <marker date="1498539948000" expanded="true" signature="7253:8136" ph="..." />
+                <marker date="1498539948000" expanded="true" signature="7283:7870" ph="{...}" />
+                <marker date="1498539948000" expanded="true" signature="7322:7434" ph="{...}" />
+                <marker date="1498539948000" expanded="true" signature="7471:7574" ph="{...}" />
+                <marker date="1498539948000" expanded="true" signature="7612:7723" ph="{...}" />
+                <marker date="1498539948000" expanded="true" signature="7761:7867" ph="{...}" />
+                <marker date="1498539948000" expanded="true" signature="7905:8012" ph="{...}" />
+                <marker date="1498539948000" expanded="true" signature="8047:8088" ph="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -93,8 +121,8 @@
       <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="550">
-              <caret line="191" column="7" lean-forward="true" selection-start-line="191" selection-start-column="7" selection-end-line="191" selection-end-column="7" />
+            <state relative-caret-position="249">
+              <caret line="139" column="30" lean-forward="true" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
               <folding />
             </state>
           </provider>
@@ -879,12 +907,12 @@
       <option name="presentableId" value="Default" />
       <updated>1498458293643</updated>
       <workItem from="1498458295318" duration="2552000" />
-      <workItem from="1498465879846" duration="18166000" />
+      <workItem from="1498465879846" duration="18792000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="20718000" />
+    <option name="totallyTimeSpent" value="21344000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="22" width="1440" height="833" extended-state="6" />
@@ -1180,14 +1208,52 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
           <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
-          <folding />
+          <folding>
+            <marker date="1498539948000" expanded="true" signature="3450:4239" ph="do ... end" />
+            <marker date="1498539948000" expanded="true" signature="3598:4131" ph="&lt;%...%&gt;" />
+            <marker date="1498539948000" expanded="true" signature="3714:4114" ph="if ... end" />
+            <marker date="1498539948000" expanded="true" signature="4005:4027" ph="if ... end" />
+            <marker date="1498539948000" expanded="true" signature="4395:6842" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4419:6833" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4454:4539" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4571:6821" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4609:5000" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4661:4756" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4678:4738" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4713:4734" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="4819:4984" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5059:5210" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5111:5193" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5243:6180" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5313:6164" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5334:5545" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5354:5523" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5566:6144" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="5583:5749" ph="&lt;%...%&gt;" />
+            <marker date="1498539948000" expanded="true" signature="5817:6041" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="6058:6123" ph="&lt;%...%&gt;" />
+            <marker date="1498539948000" expanded="true" signature="6215:6807" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="6284:6791" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="6302:6491" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="6509:6725" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="6908:7237" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="6999:7127" ph="if ... end" />
+            <marker date="1498539948000" expanded="true" signature="7253:8136" ph="..." />
+            <marker date="1498539948000" expanded="true" signature="7283:7870" ph="{...}" />
+            <marker date="1498539948000" expanded="true" signature="7322:7434" ph="{...}" />
+            <marker date="1498539948000" expanded="true" signature="7471:7574" ph="{...}" />
+            <marker date="1498539948000" expanded="true" signature="7612:7723" ph="{...}" />
+            <marker date="1498539948000" expanded="true" signature="7761:7867" ph="{...}" />
+            <marker date="1498539948000" expanded="true" signature="7905:8012" ph="{...}" />
+            <marker date="1498539948000" expanded="true" signature="8047:8088" ph="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="191" column="7" lean-forward="true" selection-start-line="191" selection-start-column="7" selection-end-line="191" selection-end-column="7" />
+        <state relative-caret-position="249">
+          <caret line="139" column="30" lean-forward="true" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
           <folding />
         </state>
       </provider>