conflict resolved

Author: brnorris03

.pydevproject

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
+<?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/orio</path>
+<path>/orio-git</path>
 </pydev_pathproperty>
 </pydev_project>

setup.py

@@ -53,10 +53,6 @@
       packages = py_packages,
       package_dir = {'orio' : 'orio'},
       #package_data = {'orio' : ['tool/zestyparser/*']},
-<<<<<<< HEAD
-      scripts = ['orcc', 'orf', 'orcuda'])
-=======
       scripts = ['orcc', 'orf', 'orcuda', 'orcl'])
->>>>>>> github/master