[glabels/zint: 1/15] Forwardporting changes for zint barcode support

[Jim Evins <jimevins src gnome org>]

commit b8b660ce6a19fd5c32d2311a6afe873c10f399c2
Author: Sam Lown <me samlown com>
Date:   Mon May 17 10:55:06 2010 +0200

    Forwardporting changes for zint barcode support

 src/Makefile.am |   10 ++++++++++
 src/bc-zint.c   |    1 -
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ebd3a1..c35bc7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,8 +123,13 @@ glabels_3_SOURCES = 			\
 	bc.h				\
 	bc-gnubarcode.c			\
 	bc-gnubarcode.h			\
+<<<<<<< HEAD
 	bc-zint.c			\
 	bc-zint.h 			\
+=======
+	bc-zint.c		\
+	bc-zint.h 	\
+>>>>>>> Forwardporting changes for zint barcode support
 	bc-postnet.c			\
 	bc-postnet.h			\
 	bc-iec16022.c			\
@@ -250,8 +255,13 @@ glabels_3_batch_SOURCES = 		\
 	bc.h				\
 	bc-gnubarcode.c			\
 	bc-gnubarcode.h			\
+<<<<<<< HEAD
 	bc-zint.c			\
 	bc-zint.h			\
+=======
+	bc-zint.c		\
+	bc-zint.h		\
+>>>>>>> Forwardporting changes for zint barcode support
 	bc-postnet.c			\
 	bc-postnet.h			\
 	bc-iec16022.c			\
diff --git a/src/bc-zint.c b/src/bc-zint.c
index 5e45d40..3a54aa4 100644
--- a/src/bc-zint.c
+++ b/src/bc-zint.c
@@ -98,7 +98,6 @@ gl_barcode_zint_new (const gchar          *id,
 	symbol->scale = (w / symbol->width);
 	symbol->height = h / symbol->scale; /* height always in standard size */
 
-
 	/* Convert Sums provided by zint encode */
 	gbc = render_zint(symbol, text_flag);