Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed conflict

  • Loading branch information...
commit 4fac8a33d8022eb309ebbe69243c4732c2b97bda 2 parents ee03319 + fa49dce
@brycemcd authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  snippets
  2. +2 −2 vimrc
2  snippets
@@ -1 +1 @@
-Subproject commit 6e9d96f9bbbcbb2fc5582b3290d2556e267f738c
+Subproject commit a0f49627c82ba01c4d30cacf2fdcc0006413e32a
View
4 vimrc
@@ -232,7 +232,7 @@ if has("gui_running")
set columns=115
if has("gui_gnome")
- set term=gnome-256color
+ " set term=gnome-256color
colorscheme railscasts
set guifont=Monospace\ Bold\ 12
endif
@@ -256,7 +256,7 @@ else
"set railscasts colorscheme when running vim in gnome terminal
if $COLORTERM == 'gnome-terminal'
- set term=gnome-256color
+ " set term=gnome-256color
colorscheme railscasts
else
colorscheme default
Please sign in to comment.
Something went wrong with that request. Please try again.