[gimp/soc-2013-combined-selection-tool] merge conflicts

[Ajay Ramanathan <ajayr src gnome org>]

commit 3f7109a0d428dd7e87da650f7ffffca1c4407ccb
Author: Ajay Ramanathan <ajay 010293 gmail com>
Date:   Sun Sep 22 00:22:47 2013 +0530

    merge conflicts

 tools/pdbgen/enums.pl |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index a8b7646..cd4f1b4 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -427,7 +427,6 @@ package Gimp::CodeGen::enums;
                       GIMP_SHAPE_N_POLYGON => '3',
                       GIMP_SHAPE_SINGLE_ROW => '4' }
        },
-<<<<<<< HEAD
     GimpComponentType =>
        { contig => 0,
          header => 'core/core-enums.h',
@@ -440,8 +439,6 @@ package Gimp::CodeGen::enums;
                       GIMP_COMPONENT_TYPE_HALF => '400',
                       GIMP_COMPONENT_TYPE_FLOAT => '500' }
        },
-=======
->>>>>>> 6e1ba8af48bac3f951ab71ff3a73ad57634fad3f
     GimpConvertDitherType =>
        { contig => 1,
          header => 'core/core-enums.h',