From a3cf8452a4d2660c8bdf995b8b4394dc235eaa68 Mon Sep 17 00:00:00 2001
From: ma6174 <ma6174@163.com>
Date: Sun, 2 Jun 2013 19:38:56 +0800
Subject: [PATCH] del conflict file

---
 colors/slate.vim (Case Conflict 1) | 11 -----------
 plugin/my.vim                      |  9 ---------
 2 files changed, 20 deletions(-)
 delete mode 100644 colors/slate.vim (Case Conflict 1)
 delete mode 100644 plugin/my.vim

diff --git a/colors/slate.vim (Case Conflict 1) b/colors/slate.vim (Case Conflict 1)
deleted file mode 100644
index 7d17344e..00000000
--- a/colors/slate.vim (Case Conflict 1)	
+++ /dev/null
@@ -1,11 +0,0 @@
-
-" It's based on:
-runtime colors/Dark.vim
-
-let g:colors_name = "SlateBG"
-
-hi Normal guibg=DarkSlateGrey guifg=AntiqueWhite1
-hi NonText guibg=#1F3F3F
-
-"hi Cursor guifg=AntiqueWhite1 guibg=bg gui=reverse
-hi Cursor guibg=salmon3
diff --git a/plugin/my.vim b/plugin/my.vim
deleted file mode 100644
index 299a49a7..00000000
--- a/plugin/my.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-function! Reddit()
-python << EOF
-import vim
-for i in dir(vim):
-    vim.current.buffer.append(i)
-for i in dir(vim.current.buffer):
-    vim.current.buffer.append(i)
-EOF
-endfunction