From 699d053333d6cf19cbc54bebdfa7f6b8e4d70819 Mon Sep 17 00:00:00 2001
From: Oshgnacknak <osh@oshgnacknak.de>
Date: Thu, 9 Jun 2022 19:43:22 +0200
Subject: [PATCH] Use iostream instead of stdio

---
 _config/nvim/UltiSnips/cpp.snippets | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/_config/nvim/UltiSnips/cpp.snippets b/_config/nvim/UltiSnips/cpp.snippets
index de7241a..1bab6bf 100644
--- a/_config/nvim/UltiSnips/cpp.snippets
+++ b/_config/nvim/UltiSnips/cpp.snippets
@@ -1,5 +1,4 @@
 snippet main
-<<<<<< HEAD
 #include <iostream>
 
 using namespace std;
@@ -17,25 +16,6 @@ snippet oshh
 
 using namespace osh;
 
-int main() {
-    println("Hello, World!");
-=======
-#include <stdio.h>
-#include <stdlib.h>
-
-int main() {
-    printf("Hello, World!\n");
-
-    return 0; 
-}
-endsnippet
-
-snippet oshh
-#define OSH_H_IMPLEMENTATION
-#include "osh.h"
-
-using namespace osh;
-
 int main() {
     println("Hello, World!");