[fswebcam/f14] Updated

[Fabian Affolter]

commit 2ee5238d87ca18928c6d84ae782db5e33ca84dee
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Mon Jul 18 00:26:05 2011 +0200

    Updated

 sources |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 77bef95..24429e7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-b4be05ed7c728c68424e947ed452b29f  fswebcam-20101118.tar.gz
-=======
 6e09f1f31cf7cd0ac1d4d688a0acbe41  fswebcam-20110717.tar.gz
->>>>>>> master
+