Resolved merge conflicts with custom-vim-snippets

c.snippets

@@ -1,5 +0,0 @@
-snippet forg "Generic for"
-for (int i = 0; i < ${1:count}; i++) {
-	${2}
-}
-endsnippet

sh.snippets

@@ -1,3 +0,0 @@
-snippet alias "Custom alias"
-alias ${1:name}="${2:command}"
-endsnippet 

texmath.snippets

@@ -1,7 +0,0 @@
-snippet eqs "Equation with split" b
-\begin{equation*}
-	\begin{split}
-		$0
-	\end{split}
-\end{equation*}
-endsnippet