[gegl] gegl-color: fix merge conflict
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] gegl-color: fix merge conflict
- Date: Tue, 19 Aug 2014 02:14:33 +0000 (UTC)
commit c9e8be7508cf489f97db723312c3f3bc333f1bf4
Author: Øyvind Kolås <pippin gimp org>
Date: Tue Aug 19 04:12:33 2014 +0200
gegl-color: fix merge conflict
gegl/property-types/gegl-color.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/gegl/property-types/gegl-color.c b/gegl/property-types/gegl-color.c
index 2f37375..3348ca4 100644
--- a/gegl/property-types/gegl-color.c
+++ b/gegl/property-types/gegl-color.c
@@ -349,12 +349,7 @@ gegl_color_set_from_string (GeglColor *self,
}
else if (token_type == '#')
{
-<<<<<<< Updated upstream
color_parsing_successfull = parse_hex (rgba, color_string);
-=======
- self->priv->rgba_color[3] = 1.f;
- color_parsing_successfull = parse_hex (self, color_string);
->>>>>>> Stashed changes
}
else if (token_type == G_TOKEN_IDENTIFIER)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]