use localtime instead of gmtime for logging

nwipe/src/device.c

@@ -27,7 +27,6 @@
 #include "logging.h"
 
 #include <parted/parted.h>
-#include <parted/debug.h> 
 
 int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount );
 

nwipe/src/logging.c

@@ -50,7 +50,7 @@ void nwipe_log( nwipe_log_t level, const char* format, ... )
 
 	/* Get the current time. */
 	t = time( NULL );
-	p = gmtime( &t );
+	p = localtime( &t );
 
 	pthread_mutex_lock( &mutex1 );
 

nwipe/src/nwipe.c

@@ -23,6 +23,9 @@
 
 #include <time.h>
 #include <signal.h>
+#include <sys/shm.h>
+#include <wait.h>
+#include <parted/parted.h>
 
 #include "nwipe.h"
 #include "context.h"
@@ -34,13 +37,6 @@
 #include "gui.h"
 
 
-#include <sys/ioctl.h>  /* FIXME: Twice Included */
-#include <sys/shm.h>
-#include <wait.h>
-
-#include <parted/parted.h>
-#include <parted/debug.h>
-
 int main( int argc, char** argv )
 {
         int nwipe_optind;              /* The result of nwipe_options().                    */

nwipe/src/version.c

@@ -4,23 +4,7 @@
  * used by configure to dynamically assign those values 
  * to documentation files.
  */
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-const char *version_string = "0.20";
-=======
-const char *version_string = "0.18";
->>>>>>> parent of 263d5d1... bump version to 0.19
-=======
 const char *version_string = "0.22";
->>>>>>> e7d9ff73fe76e9fcc04847eba2806bd0904f0499
-=======
-const char *version_string = "0.20";
->>>>>>> parent of b808b84... Revert "bump version to 0.19"
-=======
-const char *version_string = "0.22";
->>>>>>> 464bf788c534bf67a1d7290f2175dcf925f5f9ed
 const char *program_name   = "nwipe";
 const char *author_name    = "Martijn van Brummelen";
 const char *email_address  = "git@brumit.nl";