Fix upstream branch

[mirror_smartmontools-debian.git] / README

diff --git a/README b/README
index b7ad13871ebd85d2959724de7a3ebe82b07ad289..6d20c011416592a689c10aa87aa0b16481c28824 100644 (file)
--- a/README
+++ b/README
@@ -3,11 +3,7 @@ smartmontools - S.M.A.R.T. utility toolset for Darwin/Mac
 OSX, FreeBSD, Linux, NetBSD, OpenBSD, Solaris, and Windows.
 ==========================================================
 
-<<<<<<< HEAD
 $Id: README 4120 2015-08-27 16:12:21Z samm2 $
-=======
-$Id: README 4063 2015-04-19 17:34:25Z chrfranke $
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 == HOME ==
 The home for smartmontools is located at: