| commit | 6e7aac9585e8fa21e90b76b01af3af62bda1acaf | |
| author | mateor <mateorod9@gmail.com> | |
| Sun, 23 Jun 2013 01:23:54 +0000 (22 20:23 -0500) | ||
| committer | mateor <mateorod9@gmail.com> | |
| Sun, 23 Jun 2013 01:23:54 +0000 (22 20:23 -0500) | ||
| tree | cd18299756d931feacff94703e35d438eb932d27 | treesnapshot (tar.gz zip) |
| parent | 1b82c2560832ee22603d25b5465e1d4336cad906 | commitdiff |
Revert "Fix CONFLICTS function"
Whoops. Needs work....if used with a pdroid mod, it messes up and tries to
apply one of the mods twice. Probably conflicts with the function that ensures
the pdroid-type mod is the first applied (which we do as a hack to make sure
that using prepatched "provisional" files doesn't overwrite other mods...if
pdroid is applied first then we cam layer the other mods on afterwards.
This reverts commit 71b9ade837d8bd269e7a7a96d4a4af171630ca33.
Whoops. Needs work....if used with a pdroid mod, it messes up and tries to
apply one of the mods twice. Probably conflicts with the function that ensures
the pdroid-type mod is the first applied (which we do as a hack to make sure
that using prepatched "provisional" files doesn't overwrite other mods...if
pdroid is applied first then we cam layer the other mods on afterwards.
This reverts commit 71b9ade837d8bd269e7a7a96d4a4af171630ca33.
| auto_patcher | diffblobblamehistory |