gnucash maint: Fix stray merge conflict marker.
John Ralls
jralls at code.gnucash.org
Sat Dec 12 20:37:03 EST 2020
Updated via https://github.com/Gnucash/gnucash/commit/b439ac17 (commit)
from https://github.com/Gnucash/gnucash/commit/2b01bde2 (commit)
commit b439ac17651fed0eeeb2518a28983f95ee787f33
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 12 17:36:16 2020 -0800
Fix stray merge conflict marker.
diff --git a/gnucash/import-export/aqb/gnc-gwen-gui.c b/gnucash/import-export/aqb/gnc-gwen-gui.c
index 1a0569938..e0bae9e03 100644
--- a/gnucash/import-export/aqb/gnc-gwen-gui.c
+++ b/gnucash/import-export/aqb/gnc-gwen-gui.c
@@ -970,7 +970,6 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
#ifdef AQBANKING6
if (g_strcmp0(mimeType,"text/x-flickercode") == 0 && pChallenge != NULL)
-<<<<<<< Updated upstream
{
/* Chiptan Optic (aka Flicker) */
gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_challenge), TRUE);
@@ -981,18 +980,6 @@ get_input(GncGWENGui *gui, guint32 flags, const gchar *title,
}
else if(mimeType != NULL && pChallenge != NULL && lChallenge > 0)
{
-=======
- {
- /* Chiptan Optic (aka Flicker) */
- gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_challenge), TRUE);
- gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_marker), TRUE);
- gtk_widget_set_visible(GTK_WIDGET(flickergui->flicker_hbox), TRUE);
- gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_barwidth), TRUE);
- gtk_widget_set_visible(GTK_WIDGET(flickergui->spin_delay), TRUE);
- }
- else if(mimeType != NULL && pChallenge != NULL && lChallenge > 0)
- {
->>>>>>> Stashed changes
/* Phototan or Chiptan QR */
gtk_widget_set_visible(GTK_WIDGET(optical_challenge), TRUE);
}
Summary of changes:
gnucash/import-export/aqb/gnc-gwen-gui.c | 13 -------------
1 file changed, 13 deletions(-)
More information about the gnucash-changes
mailing list