Fix merge conflicts

This commit is contained in:
Ariejan de Vroom 2023-03-03 15:41:47 +01:00
parent be83722dea
commit bc85ec1a03
Signed by: ariejan
GPG Key ID: AD739154F713697B

View File

@ -80,11 +80,7 @@ Items marked with 🔧 are required to (safely) operate the vehicle.
- [x] Replace outer tie rods
- [x] Fix front wheel camber / get a proper wheel alignment; planned
- [ ] Check what's up with ABS. It's not mandatory for a car of this vintage, but I'd be nice to figure out what's going on: `01276 ABS Hydrolic Pump (V64) signal outside specifications; might be a relay or wire, but most likely it needs a new ABS pump.
<<<<<<< HEAD
- [x] Replace rear wheel bearings and brake drums; replaced
=======
- [x] Replace rear wheel bearings and brake drums
>>>>>>> 2735575 (Add window regulator photo)
### Bodywork
@ -93,11 +89,7 @@ Items marked with 🔧 are required to (safely) operate the vehicle.
- [x] Replace worn-out gas cylinders for boot; replaced 🔧
- [x] Fix key-locking mechanism driver side; kind-of fixed; manual operation passenger side, key-operation driver side.
- [x] Check functioning of passenger side electric window; cleaned connector to actuator
<<<<<<< HEAD
- [ ] Replace rear electric window regulators; right: done, left: todo
=======
- [x] Check and repair rear electric windows; done!
>>>>>>> 2735575 (Add window regulator photo)
- [x] Align wipers correctly; re-aligned motor and wiper linkage
- [x] Replace wipers 🔧
- [x] Fix wiper interval, it's not working; relay was loose, cleaned and re-installed.