diff --git a/README b/README index 1df36682..9fc1d51c 100644 --- a/README +++ b/README @@ -26,7 +26,6 @@ but you may need to download it separately at: Kernels 2.3.34 and later, and all 2.4.x kernels, contain the new I2C package; however, you may still need to download and install the latest I2C version if lm_sensors does not compile. ->>>>>>> 1.51 At least the following I2C/SMBus adapters are supported: