[gtk/matthiasc/lottie2: 30/40] Remove conflict marker

[Matthias Clasen <matthiasc src gnome org>]

commit 859b5301178abc836e3da85fa37feb9c3e23bda7
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 25 20:51:18 2020 -0500

    Remove conflict marker

 gsk/gskenums.h | 1 -
 1 file changed, 1 deletion(-)
---
diff --git a/gsk/gskenums.h b/gsk/gskenums.h
index 6b1e0647ab..8ca577563d 100644
--- a/gsk/gskenums.h
+++ b/gsk/gskenums.h
@@ -196,7 +196,6 @@ typedef enum {
 } GskFillRule;
 
 /**
-<<<<<<< HEAD
  * @GSK_LINE_CAP_BUTT: Start and stop the line exactly at the start
  *     and end point
  * @GSK_LINE_CAP_ROUND: Use a round ending, the center of the circle