merged conflicts (>_<#)

Browse Source

preferencesAboutTextFull

shibakaneki 14 years ago

parent 6a109355c0

commit cc3c31c3a6

1 changed files with 6 additions and 6 deletions

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

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save