Fixed merge conflict

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '7.1.25'
+__version__ = '7.1.26'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/tax_rule/tax_rule.json

@@ -791,7 +791,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:17:58.691011", 
+ "modified": "2016-12-13 15:56:28.704122", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -820,10 +820,10 @@
    "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_seen": 0
-}
+}