Permalink
Browse files

Fix conflict

  • Loading branch information...
Aldis Berjoza
Aldis Berjoza committed Aug 13, 2012
1 parent a4e82f3 commit 8964af21a9a5ae196f9b3b7be7b1ccb70db83991
Showing with 0 additions and 35 deletions.
  1. +0 −35 snippets/coffee/coffee.snippets
@@ -70,46 +70,11 @@ ${1:(${2:arguments}) }->
endsnippet
-<<<<<<< HEAD
-
-snippet log "console.log('...')"
-console.log ${1:"${2}"}
-endsnippet
-
-
-
-snippet info "console.info('...')"
-console.info ${1:"${2}"}
-endsnippet
-
-
-
-snippet warn "console.warn('...')"
-console.warn ${1:"${2}"}
-endsnippet
-
-
-
-snippet error "console.error('...')"
-console.error ${1:"${2}"}
-endsnippet
-
-
-
-snippet debug "console.debug('...')"
-console.debug ${1:"${2}"}
-endsnippet
-
-
-
-
-=======
snippet "\b(log|debug|warn|error|info)" "console.(log|debug|warn|error|info)" r
console.`!p snip.rv=match.group(1)` ${1:"${2}"}
endsnippet
->>>>>>> 2e317217f0fd2f09fe370cd0525c9a6c09b00034
snippet alert
alert ${1:"${2}"}
endsnippet

0 comments on commit 8964af2

Please sign in to comment.