gegl-color: fix merge conflict

parent bc75b960
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment