commit 32f1ad2ca536b0eea889dace36137354817facf8
author Scott Baker <smbaker@gmail.com> Wed Jan 20 16:00:01 2016 -0800
committer Scott Baker <smbaker@gmail.com> Wed Jan 20 16:12:25 2016 -0800
tree f5c3df6696c7d18be5c24a8d25b7d65a2abacc2d
parent 35dcea5b1dc2c19d1892c72749771df7b7a24fb1
parent 8e4ca635eb231f87584cd17f71f8b76dcc21905e

resolve merge conflict

xos/synchronizers/base/ansible.py

diff --git a/xos/synchronizers/base/ansible.py b/xos/synchronizers/base/ansible.py
index 17a0c45..7c30685 100644
--- a/xos/synchronizers/base/ansible.py
+++ b/xos/synchronizers/base/ansible.py
@@ -100,7 +100,7 @@
 
     if (not Config().observer_pretend):
         if not run_ansible_script:
-            run_ansible_script = os.path.join(XOS_DIR, "observer/run_ansible")
+            run_ansible_script = os.path.join(XOS_DIR, "synchronizers/base/run_ansible")
 
         process = subprocess.Popen("%s %s" % (run_ansible_script, shellquote(fqp)), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
         msg = process.stdout.read()