fix conflict

OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=45

_service

@@ -1,4 +0,0 @@
-<services>
-  
-  
-<service name="set_version"/></services>

_service_error

@@ -1,2 +0,0 @@
-service set_version failed:
-ERROR: no version is given and can't get detected automatically

hdparm-9.36.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1a10926f8bbf000db9f1614484614400b52b4fc1683e1b673805bfd938401ff
+size 104981

hdparm.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Nov 29 11:42:35 UTC 2010 - puzel@novell.com
+
+- update to hdparm-9.36 
+  - udpated raid1ext4trim.sh script to version 1.4
+  - updated wiper.sh to support hfsplus and ntfs filesystem types,
+    courtesy of Heiko Wegeler
+  - updated wiper.sh with new flag to enable unattended operation,
+    and handle SIGPIPE
+  - updated manpage to indicate max sector range of 65335 for TRIM
+
 -------------------------------------------------------------------
 Thu Oct 21 16:13:02 UTC 2010 - mseben@gmail.com
 

hdparm.spec

@@ -24,7 +24,7 @@ Group:          Hardware/Other
 PreReq:         %insserv_prereq %fillup_prereq coreutils
 Provides:       base:/sbin/hdparm
 AutoReqProv:    on
-Version:        VERSION
+Version:        9.36
 Release:        1
 Summary:        A Program to get and set hard disk parameters
 Source:         %{name}-%{version}.tar.bz2