MAGETWO-62136: Prepare code base for 2.1.4

Oleksii Korshenko · Oleksii Korshenko · commit 1e91b62597e7 · 2016-12-12T14:53:53.000-06:00
- fixed merge issue
diff --git a/app/code/Magento/Braintree/Helper/Country.php b/app/code/Magento/Braintree/Helper/Country.php
@@ -7,7 +7,6 @@
 
 use Magento\Braintree\Model\Adminhtml\System\Config\Country as CountryConfig;
 use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
-use Magento\Braintree\Model\Adminhtml\System\Config\Country as CountryConfig;
 
 /**
  * Class Country
