Update general_words_lang.php

application/language/swedish/general_words_lang.php

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 
 defined('BASEPATH') OR exit('No direct script access allowed');