soc.2009.webkitmessageview: 75ffceee: fixed conflicts in previous merge.

[tdrhq at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 75ffceeee02a5b5f52aac4008a35ac04f5f5a5f4
Ancestor: e77c0431061a0078e5da393c05040968f004a6eb
Author: tdrhq at soc.pidgin.im
Date: 2009-08-26T03:19:30
Branch: im.pidgin.soc.2009.webkitmessageview
URL: http://d.pidgin.im/viewmtn/revision/info/75ffceeee02a5b5f52aac4008a35ac04f5f5a5f4

Modified files:
        pidgin/plugins/Makefile.am

ChangeLog: 

fixed conflicts in previous merge.

-------------- next part --------------
============================================================
--- pidgin/plugins/Makefile.am	a26ed1fc4d85b8faa95715c63173f3fb90ecef48
+++ pidgin/plugins/Makefile.am	278f22aaf9a322a4ae696da2f37fc1192baea699
@@ -76,10 +76,6 @@ themeedit_la_SOURCES        = themeedit.
 sendbutton_la_SOURCES       = sendbutton.c
 spellchk_la_SOURCES         = spellchk.c
 themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
-<<<<<<< variant A
-timestamp_la_SOURCES        = timestamp.c
-timestamp_format_la_SOURCES = timestamp_format.c
-vvconfig_SOURCES            = vvconfig.c
 xmppconsole_la_SOURCES      = xmppconsole.c
 
 convcolors_la_LIBADD        = $(GTK_LIBS)
@@ -87,41 +83,12 @@ gtkbuddynote_la_LIBADD      = $(GTK_LIBS
 extplacement_la_LIBADD      = $(GTK_LIBS)
 gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
 gtkbuddynote_la_LIBADD      = $(GTK_LIBS)
-history_la_LIBADD           = $(GTK_LIBS)
 iconaway_la_LIBADD          = $(GTK_LIBS)
-markerline_la_LIBADD        = $(GTK_LIBS)
-notify_la_LIBADD            = $(GTK_LIBS)
 pidginrc_la_LIBADD          = $(GTK_LIBS)
 relnot_la_LIBADD            = $(GLIB_LIBS)
 sendbutton_la_LIBADD        = $(GTK_LIBS)
 spellchk_la_LIBADD          = $(GTK_LIBS)
 themeedit_la_LIBADD         = $(GTK_LIBS)
-timestamp_la_LIBADD         = $(GTK_LIBS)
-timestamp_format_la_LIBADD  = $(GTK_LIBS)
-vvconfig_la_LIBADD          = $(GTK_LIBS) $(GSTREAMER_LIBS)
->>>>>>> variant B
-####### Ancestor
-timestamp_la_SOURCES        = timestamp.c
-timestamp_format_la_SOURCES = timestamp_format.c
-xmppconsole_la_SOURCES      = xmppconsole.c
-
-convcolors_la_LIBADD        = $(GTK_LIBS)
-contact_priority_la_LIBADD  = $(GTK_LIBS)
-extplacement_la_LIBADD      = $(GTK_LIBS)
-gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
-gtkbuddynote_la_LIBADD      = $(GTK_LIBS)
-history_la_LIBADD           = $(GTK_LIBS)
-iconaway_la_LIBADD          = $(GTK_LIBS)
-markerline_la_LIBADD        = $(GTK_LIBS)
-notify_la_LIBADD            = $(GTK_LIBS)
-pidginrc_la_LIBADD          = $(GTK_LIBS)
-relnot_la_LIBADD            = $(GLIB_LIBS)
-sendbutton_la_LIBADD        = $(GTK_LIBS)
-spellchk_la_LIBADD          = $(GTK_LIBS)
-themeedit_la_LIBADD         = $(GTK_LIBS)
-timestamp_la_LIBADD         = $(GTK_LIBS)
-timestamp_format_la_LIBADD  = $(GTK_LIBS)
-======= end
 xmppconsole_la_LIBADD       = $(GTK_LIBS)
 
 endif # PLUGINS