From dbca58ddbcdc44a1736feee38fd368941dc91158 Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Tue, 4 Mar 2014 17:51:43 -0800
Subject: [PATCH] fix bad conflict resolution, include uiauto bootstrap when
 launching instruments

---
 lib/devices/ios/ios.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/devices/ios/ios.js b/lib/devices/ios/ios.js
index 6cbc2cf4c..95172b5a9 100644
--- a/lib/devices/ios/ios.js
+++ b/lib/devices/ios/ios.js
@@ -30,6 +30,7 @@ var path = require('path')
   , mkdirp = require('mkdirp')
   , getSimRoot = settings.getSimRoot
   , fruitstrap = path.resolve(__dirname, '../../../build/fruitstrap/fruitstrap')
+  , uiauto = require('appium-uiauto')
   , UnknownError = errors.UnknownError;
 
 // XML Plist library helper
@@ -291,7 +292,7 @@ IOS.prototype.makeInstruments = function () {
     app: this.args.app || this.args.bundleId
   , udid: this.args.udid
   , ignoreStartupExit: this.shouldIgnoreInstrumentsExit()
-  , bootstrap: path.resolve(__dirname, 'uiauto', 'bootstrap.js')
+  , bootstrap: uiauto.bootstrap
   , template: this.args.automationTraceTemplatePath
   , sock: sock
   , withoutDelay: this.args.withoutDelay