fix absolute_focus=0

diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml
index ca3566b1e8621c534cb47a3ea3b3e8f1c6e6bda3..6a10dcff96581a957a0190fcc30360017f7c7217 100644 (file)
--- a/etc/telecaster/telecaster.yml
+++ b/etc/telecaster/telecaster.yml
@@ -12,14 +12,7 @@ telecaster:
         width: 1280
         height: 720
         framerate: 30
-<<<<<<< HEAD
         flip: none
-=======
-        flip: rotate-180
-        zoom: 140
-        sharpness: 144
-        focus: 0
->>>>>>> 878e850 (fix absolute_focus=0)
         format: image/jpeg
         decoder: jpegdec
         audio_delay: 0