.

sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets

@@ -9,12 +9,8 @@ snippet fun "function"
 	function ${1:function_name}(${2}) {
 		${0:${VISUAL}}
 	}
-<<<<<<< HEAD
-snippet fun "async function"
-=======
 # Asynchronous Function
 snippet asf "async function"
->>>>>>> 27ad0d07862847896f691309a544a206783c94d6
 	async function ${1:function_name}(${2}) {
 		${0:${VISUAL}}
 	}
@@ -279,6 +275,8 @@ snippet cprof "console.profile"
 	console.profileEnd();
 snippet ctable "console.table"
 	console.table(${1:"${2:value}"});
+snippet clstr "console.log stringified"
+	console.log(JSON.stringify(${0}, null, 2));
 # Misc
 snippet us
 	'use strict';
@@ -287,11 +285,8 @@ snippet timeout
 	setTimeout(function () {${0}}${2}, ${1:10});
 snippet const
 	const ${1} = ${0};
-<<<<<<< HEAD
-=======
 snippet constn
 	const ${1} = new ${0};
->>>>>>> 27ad0d07862847896f691309a544a206783c94d6
 snippet let
 	let ${1} = ${0};
 snippet im "import xyz from 'xyz'"