[gtk+/wip/strength-bar] xxx: fix merge conflict oops

[Cosimo Cecchi <cosimoc src gnome org>]

commit c4e99948e7b857370f585a5003c41ecb48821246
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jun 8 23:35:42 2012 -0400

    xxx: fix merge conflict oops

 docs/reference/gtk/gtk3-sections.txt |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 96a30c1..2bd6cb5 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -5704,16 +5704,11 @@ GTK_STYLE_CLASS_RIGHT
 GTK_STYLE_CLASS_LINKED
 GTK_STYLE_CLASS_ARROW
 GTK_STYLE_CLASS_OSD
-<<<<<<< HEAD
-=======
 GTK_STYLE_CLASS_STRENGTH_BAR
-<<<<<<< HEAD
-GTK_STYLE_CLASS_SUCCESS
->>>>>>> f7335b7... strength-bar: introduce GtkStrengthBar
-=======
 GTK_STYLE_CLASS_EMPTY
 GTK_STYLE_CLASS_FILL_COMPONENT
->>>>>>> a171510... f
+GTK_STYLE_CLASS_WEAK
+GTK_STYLE_CLASS_STRONG
 GTK_STYLE_REGION_COLUMN
 GTK_STYLE_REGION_COLUMN_HEADER
 GTK_STYLE_REGION_ROW