[gxml] Fixed merge from gxml-0.8 branch for 0.8.2 new release

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 43b9d758ee80842f0f5189eb321421b9768f4f8a
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jan 14 14:18:15 2016 -0600

    Fixed merge from gxml-0.8 branch for 0.8.2 new release

 configure.ac              |    8 --------
 gxml/libxml-Document.vala |   14 --------------
 test/DocumentTest.vala    |    3 ---
 3 files changed, 0 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f2ef667..b5a93cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,11 +12,7 @@
 # Release Version
 m4_define([project_major_version], [0])
 m4_define([project_minor_version], [8])
-<<<<<<< HEAD
-m4_define([project_micro_version], [1])
-=======
 m4_define([project_micro_version], [2])
->>>>>>> gxml-0.8
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
@@ -26,11 +22,7 @@ m4_define([project_nano_version], [0])
 #   If public symbols have been added since last release, increment age
 #   If public symbols have been removed since last release, set age to 0
 m4_define([project_lt_current], [8])
-<<<<<<< HEAD
-m4_define([project_lt_revision], [1])
-=======
 m4_define([project_lt_revision], [2])
->>>>>>> gxml-0.8
 m4_define([project_lt_age], [0])
 
 # Combine numbers to various version variables (different uses)
diff --git a/gxml/libxml-Document.vala b/gxml/libxml-Document.vala
index de9975c..831f899 100644
--- a/gxml/libxml-Document.vala
+++ b/gxml/libxml-Document.vala
@@ -442,26 +442,16 @@ namespace GXml {
                                throw new GXml.Error.PARSER (errmsg);
                        }
                        Xmlx.reset_last_error ();
-<<<<<<< HEAD
-                       e = Xmlx.get_last_error ();
-=======
->>>>>>> gxml-0.8
                        var doc = Xml.Parser.parse_memory ((string) ostream.data, ((string) 
ostream.data).length);
                        if (doc != null) {
                                this.from_libxml2 (doc);
                        } else {
-<<<<<<< HEAD
-                               e = Xmlx.get_last_error ();
-                               if (e != null) {
-                                       errmsg += ".  " + libxml2_error_to_string (e);
-=======
                                errmsg = "Parser Error";
                                e = Xmlx.get_last_error ();
                                if (e != null) {
                                        string s = libxml2_error_to_string (e);
                                        if (s != null)
                                                errmsg += s;
->>>>>>> gxml-0.8
                                }
                                GXml.exception (DomException.INVALID_DOC, errmsg);
                                throw new GXml.Error.PARSER (errmsg);
@@ -503,14 +493,10 @@ namespace GXml {
                  this.from_libxml2 (doc);
                        var e = Xmlx.get_last_error ();
                        if (e != null) {
-<<<<<<< HEAD
-                               var errmsg = ".  " + libxml2_error_to_string (e);
-=======
                                var errmsg = "Parser Error for string";
                                string s = libxml2_error_to_string (e);
                                if (s != null)
                                        errmsg = ".  ";
->>>>>>> gxml-0.8
                                GXml.exception (DomException.INVALID_DOC, errmsg);
                                throw new GXml.Error.PARSER (errmsg);
                        }
diff --git a/test/DocumentTest.vala b/test/DocumentTest.vala
index 720e7a3..1dc6956 100644
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@ -125,8 +125,6 @@ class DocumentTest : GXmlTest {
                                assert_not_reached ();
                        }
                        });
-<<<<<<< HEAD
-=======
                Test.add_func ("/gxml/document/gfile/remote", () => {
                        try {
                                var rf = GLib.File.new_for_uri 
("https://git.gnome.org/browse/gxml/plain/gxml.doap";);
@@ -156,7 +154,6 @@ class DocumentTest : GXmlTest {
                                assert_not_reached ();
                        }
                });
->>>>>>> gxml-0.8
                Test.add_func ("/gxml/document/construct_from_stream_error", () => {
                                File fin;
                                InputStream instream;