[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] branch master updated: Solved merge conflicts
From: |
gnunet |
Subject: |
[taler-taler-mdb] branch master updated: Solved merge conflicts |
Date: |
Fri, 27 Dec 2019 17:36:04 +0100 |
This is an automated email from the git hooks/post-receive script.
dominik-hofer pushed a commit to branch master
in repository taler-mdb.
The following commit(s) were added to refs/heads/master by this push:
new eb731a9 Solved merge conflicts
eb731a9 is described below
commit eb731a9402f75c02138975caea6838602c6ddecf
Author: Dominik Hofer <address@hidden>
AuthorDate: Fri Dec 27 17:35:58 2019 +0100
Solved merge conflicts
---
src/main.c | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/src/main.c b/src/main.c
index ff8b8de..1ff0255 100644
--- a/src/main.c
+++ b/src/main.c
@@ -195,11 +195,7 @@ along with
/* Session Commands */
/* Refer to the mdb interface specifications v4.2 p.131 */
#define READER_BEGIN_SESSION "03"
-<<<<<<< Updated upstream
-#define READER_FUNDS_AVAILABLE "000A"
-=======
#define READER_FUNDS_AVAILABLE "00A0"
->>>>>>> Stashed changes
#define READER_END_SESSION "07"
/* Vend Commands */
@@ -964,11 +960,7 @@ shutdown_task (void *cls)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Unable to open /gpio/unexport for cancel button\n");
}
-<<<<<<< Updated upstream
- (void) write (cancelButton.cancelbuttonfd, "17", 2);
-=======
(void) write (cancelButton.cancelbuttonfd, "23", 2);
->>>>>>> Stashed changes
close (cancelButton.cancelbuttonfd);
}
/* free the allocated productes read from config file */
@@ -2064,9 +2056,6 @@ handle_command (const char *hex,
break;
}
case VMC_CONF:
-<<<<<<< Updated upstream
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-=======
{
unsigned int subcmd;
@@ -2091,7 +2080,6 @@ handle_command (const char *hex,
case VMC_READER_CONF:
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
->>>>>>> Stashed changes
"Received request for configuration via MDB\n");
mdb.cmd = &readerConfigData;
break;
@@ -2663,44 +2651,25 @@ run (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Unable to open /gpio/export for cancel button\n");
}
-<<<<<<< Updated upstream
- (void) write (cancelButton.cancelbuttonfd, "17", 2);
- close (cancelButton.cancelbuttonfd);
-
- cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio17/direction",
-=======
(void) write (cancelButton.cancelbuttonfd, "23", 2);
close (cancelButton.cancelbuttonfd);
cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio23/direction",
->>>>>>> Stashed changes
O_WRONLY);
if (0 > cancelButton.cancelbuttonfd)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-<<<<<<< Updated upstream
- "Unable to open /gpio/gpio17/direction for cancel button\n");
-=======
"Unable to open /gpio/gpio23/direction for cancel button\n");
->>>>>>> Stashed changes
}
(void) write (cancelButton.cancelbuttonfd, "in", 2);
close (cancelButton.cancelbuttonfd);
-<<<<<<< Updated upstream
- cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio17/value",
-=======
cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio23/value",
->>>>>>> Stashed changes
O_RDONLY);
if (0 > cancelButton.cancelbuttonfd)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-<<<<<<< Updated upstream
- "Unable to open /gpio/gpio17/value for cancel button\n");
-=======
"Unable to open /gpio/gpio23/value for cancel button\n");
->>>>>>> Stashed changes
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-mdb] branch master updated: Solved merge conflicts,
gnunet <=