merge_1725.diff

mateor@mateor-HP-m6:~/development/new_pants/pants$ git branch
  intellij
* master
  zipalign3
mateor@mateor-HP-m6:~/development/new_pants/pants$ git pull pants master
From https://github.com/pantsbuild/pants
 * branch            master     -> FETCH_HEAD
Already up-to-date.
mateor@mateor-HP-m6:~/development/new_pants/pants$ ./rbt patch 1725
Patch is being applied from request 1725 with diff revision 3.

error: patch failed: src/python/pants/base/target.py:5
Falling back to three-way merge...
Applied patch to 'src/python/pants/base/target.py' with conflicts.
U src/python/pants/base/target.py

The patch was partially applied, but there were conflicts in:

    src/python/pants/base/target.py

mateor@mateor-HP-m6:~/development/new_pants/pants$ git log -1
commit 58b6b15e70181611433cfb39f941ad4c1206baf1
Author: John Sirois <john.sirois@gmail.com>
Date:   Fri Feb 6 13:37:18 2015 -0700

    Expand scope of python file format checks.

    This expands check_header.sh and isort.sh scope out to the examples/ and
    testprojects/ directories.

    Testing Done:
    I ran `./build-support/bin/check_header.sh` and
    `./build-support/bin/isort.sh -f` producing the examples/ and
    testprojects/ fixes in this RB.

    CI went green here:
      https://travis-ci.org/pantsbuild/pants/builds/49789005

    Bugs closed: 1052

    Reviewed at https://rbcommons.com/s/twitter/r/1729/

####################################################################
Snippet from target.py


<<<<<<< ours
import os
import sys
=======
import functools
import os
>>>>>>> theirs
from hashlib import sha1


#################################################################

Diff that fails:

-from hashlib import sha1
+import functools
 import os
-import sys
+from hashlib import sha1