[blender/f18] Resolve merge conflicts in blender-2.65-syspath.patch

[Jochen Schmitt]

commit 3103d900ccda99e17654f4c89b48bb4b8b45abd8
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Dec 15 10:42:26 2012 +0100

    Resolve merge conflicts in blender-2.65-syspath.patch

 blender-2.65-syspath.patch |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/blender-2.65-syspath.patch b/blender-2.65-syspath.patch
index 4ff9650..e867baa 100644
--- a/blender-2.65-syspath.patch
+++ b/blender-2.65-syspath.patch
@@ -1,20 +1,12 @@
 diff -up blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.65/source/blender/blenfont/intern/blf_lang.c
 --- blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath	2012-12-10 20:25:45.000000000 +0100
-<<<<<<< HEAD
-+++ blender-2.65/source/blender/blenfont/intern/blf_lang.c	2012-12-13 10:38:50.273961152 +0100
-=======
 +++ blender-2.65/source/blender/blenfont/intern/blf_lang.c	2012-12-15 08:39:00.897062402 +0100
->>>>>>> master
 @@ -83,7 +83,7 @@ static void free_locales(void)
  
  static void fill_locales(void)
  {
 -	char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
-<<<<<<< HEAD
-+	char *languages_path = "/usr/share/blender";
-=======
 +        char languages_path[FILE_MAX] = "/usr/share/blender";
->>>>>>> master
  	LinkNode *lines = NULL, *line;
  	char *str;
  	int idx = 0;
@@ -29,11 +21,7 @@ diff -up blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath blender-
  		bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
 diff -up blender-2.65/source/blender/blenlib/intern/path_util.c.syspath blender-2.65/source/blender/blenlib/intern/path_util.c
 --- blender-2.65/source/blender/blenlib/intern/path_util.c.syspath	2012-12-10 20:25:44.000000000 +0100
-<<<<<<< HEAD
-+++ blender-2.65/source/blender/blenlib/intern/path_util.c	2012-12-11 23:06:50.847028569 +0100
-=======
 +++ blender-2.65/source/blender/blenlib/intern/path_util.c	2012-12-15 08:34:18.594027763 +0100
->>>>>>> master
 @@ -983,38 +983,6 @@ static int get_path_system(char *targetp
  	char system_path[FILE_MAX];
  	const char *system_base_path;