remove dropbox conflicts from sublime dir

Browse source

...

This commit is contained in:

Sami Samhuri 2012-08-02 16:01:33 -07:00

parent 1115270b2e

commit b01096ed0e

113 changed files with 0 additions and 0 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 Expand all files Collapse all files

BIN

sublime/Packages/CSS/css_completions (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/D/Symbol List-Method-Constructor.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Meta Info Summary (Hackintosh's conflicted copy 2012-07-24).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Meta Info Summary (Ruxton's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Startup (Hackintosh's conflicted copy 2012-07-24).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Startup.cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/Syntax Summary (Hackintosh's conflicted copy 2012-07-24).cache

View file

Binary file not shown.

BIN

sublime/Packages/Default/comment (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/comment (Ruxton's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/copy_path (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/delete_word (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/detect_indentation (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/duplicate_line (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/echo (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/exec (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/exec (Ruxton's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/fold (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/font (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/goto_line (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/indentation (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/kill_ring (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/mark (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/new_templates (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/open_file_settings (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/open_in_browser (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/paragraph (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/save_on_focus_lost (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/scroll (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/send2trash/__init__ (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/send2trash/plat_osx (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/set_unsaved_view_name (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/side_bar (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/sort (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/swap_line (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/switch_file (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/transform (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/transpose (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Default/trim_trailing_white_space (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Erlang/Erlang.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Erlang/HTML (Erlang).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Erlang/Indentation Rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Groovy/Groovy.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/HTML/encode_html_entities (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/HTML/html_completions (Hackintosh's conflicted copy 2012-07-24).pyc

View file

Binary file not shown.

BIN

sublime/Packages/HTML/html_completions (Ruxton's conflicted copy 2012-07-23).pyc

View file

Binary file not shown.

BIN

sublime/Packages/Haskell/Literate Haskell.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Java/Java Server Pages (JSP).tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Java/Java.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Java/JavaDoc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Java/JavaProperties.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Java/Symbol List%3A Inner Inner Class Methods.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/Bibtex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/LaTeX Beamer.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/LaTeX Log.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/LaTeX Memoir.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/LaTeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/TeX Math.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/LaTeX/TeX.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Markdown/Markdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Markdown/MultiMarkdown.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Markdown/Symbol List - Heading.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Matlab/Indent.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Matlab/Matlab.tmLanguage (Ruxton's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Matlab/Miscellaneous.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/Matlab/Symbols.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/OCaml/Indent rules.tmPreferences (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/OCaml/OCaml.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/OCaml/OCamllex.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/OCaml/OCamlyacc.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

BIN

sublime/Packages/OCaml/camlp4.tmLanguage (Hackintosh's conflicted copy 2012-07-23).cache

View file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more