From 0b31062480b2277c9e550ef104a5113b18a6c911 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Tue, 24 Jan 2017 01:24:05 +0100
Subject: [PATCH] Remove diff meta info from unresolved merge conflict

Should remove the "unsupported module" error in Android Studio
---
 wear/wear.iml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/wear/wear.iml b/wear/wear.iml
index 0de50a9087..ad76ffdb10 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -132,11 +132,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.denley.wearpreferenceactivity/wearpreferenceactivity/0.5.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/ustwo-clockwise-debug/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-<<<<<<< Updated upstream
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-=======
->>>>>>> Stashed changes
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -158,4 +155,4 @@
     <orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>