Permalink
Browse files

Conflicts.

  • Loading branch information...
2 parents 982dcd0 + c260344 commit e8466f4744912c87df59ed2dc915397b81227d97 @geetarista committed Apr 12, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 Package Control.sublime-settings
@@ -1,8 +1,9 @@
{
- "auto_upgrade_last_run": 1334247587,
+ "auto_upgrade_last_run": 1330310724,
"installed_packages":
[
"Alignment",
+ "coffee-script-tmbundle",
"CoffeeScript",
"CTags",
"Gist",
@@ -52,7 +53,7 @@
"https://bitbucket.org/sublimator/sublime-2-zencoding",
"https://github.com/maltize/sublime-text-2-ruby-tests",
"https://github.com/kneath/github_textmate_preview",
- "https://github.com/kneath/github_textmate_preview"
+ "https://github.com/revolunet/sublimetext-markdown-preview"
],
"repository_channels":
[

0 comments on commit e8466f4

Please sign in to comment.