fixed patch conflict

Browse Source

...

This commit is contained in:

Rushabh Mehta

2011-08-30 16:09:01 +05:30

parent d8cae39a8b fe5e8eb1b6

commit 910d955779

83 changed files with 3424 additions and 7764 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1180

patches/old_patches/patch_1.py Normal file

File diff suppressed because it is too large Load Diff

1205

patches/patch.py

File diff suppressed because it is too large Load Diff