From 6d7e3e8b04b63d92c61d1109c35163690f2c9948 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 17:55:02 +0000
Subject: reolved merge conflict

---
(limited to 'core/applets')

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 6ec4583..83c148f 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -12,7 +12,7 @@
 // copyright 2002 Jeremy Cowgar <jc@cowgar.com>
 /*
  * $Id$
- */
+*/
 // copyright 2002 and 2003  L.J.Potter <ljp@llornkcor.com>
 
 extern "C" {
@@ -27,7 +27,6 @@ extern "C" {
 
 #include <errno.h>
 
-
 typedef struct _waveheader {
   u_long  main_chunk; /* 'RIFF'  */
   u_long  length;     /* filelen */
--
cgit v0.9.0.2