[gnome-terminal/gnome-3-12] build: Resolve git merge conflict

[Egmont Koblinger <egmontkob src gnome org>]

commit 1d71f91712cf338a8c1fbef9593bb147f47dd01e
Author: Egmont Koblinger <egmont gmail com>
Date:   Mon Jun 2 23:49:21 2014 +0200

    build: Resolve git merge conflict

 src/terminal-app.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/src/terminal-app.c b/src/terminal-app.c
index a416db9..a97f7ee 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -667,11 +667,7 @@ terminal_app_ensure_encoding (TerminalApp *app,
 {
   TerminalEncoding *encoding;
 
-<<<<<<< HEAD
-  encoding = g_hash_table_lookup (app->encodings, charset ? charset : "current");
-=======
   encoding = g_hash_table_lookup (app->encodings, charset_validated (charset));
->>>>>>> b0bdd47... app: Only allow valid charsets
   if (encoding == NULL)
     {
       encoding = terminal_encoding_new (charset,