Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

removing accidentally checked in conflict markers

  • Loading branch information...
commit 38f1d7b19deb27c4583b703739b899d8a26da9fe 1 parent d62b126
Srushti Ambekallu authored

Showing 1 changed file with 0 additions and 13 deletions. Show diff stats Hide diff stats

  1. +0 13 README.md
13 README.md
Source Rendered
@@ -52,10 +52,6 @@ The leader is mapped to `,`
52 52 `,,` - Toggle between last two buffers
53 53
54 54
55   -<<<<<<< HEAD
56   -=======
57   -
58   ->>>>>>> Modified README
59 55 ### Open/Edit files
60 56
61 57 `,ew` - Open/Edit file in the current directory
@@ -68,13 +64,9 @@ The leader is mapped to `,`
68 64
69 65 ### Execute Ruby Specs
70 66
71   -<<<<<<< HEAD
72 67 `,s` - Run one spec under the cursor
73 68
74 69 `,S` - Run all specs in the current file
75   -=======
76   -
77   ->>>>>>> Modified README
78 70
79 71 `,-` - Rerun last rake command (most likely the last run spec)
80 72
@@ -90,10 +82,7 @@ The leader is mapped to `,`
90 82
91 83 `<tab>` - auto complete or expand snippet
92 84
93   -<<<<<<< HEAD
94 85 See `.vimrc` for more.
95   -=======
96   ->>>>>>> Modified README
97 86
98 87 ## Plugins
99 88
@@ -145,8 +134,6 @@ Provides text-objects for Ruby blocks
145 134
146 135 http://vimcasts.org/blog/2010/12/a-text-object-for-ruby-blocks/
147 136
148   -<<<<<<< HEAD
149   -=======
150 137 ### sparkup (`ctrl+e`)
151 138
152 139 Expand CSS selectors `div.event` in to markup `<div class='event'></div>`

0 comments on commit 38f1d7b

Please sign in to comment.
Something went wrong with that request. Please try again.