From dcc1ad9462d964e63d1d09d4a7e570ad0efdbc6d Mon Sep 17 00:00:00 2001
From: zhangshiming <zhangshiming@shsening.com>
Date: 星期五, 25 三月 2022 16:02:39 +0800
Subject: [PATCH] check file modified

---
 debug/_image_clip_setting.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debug/_image_clip_setting.py b/debug/_image_clip_setting.py
index 85f32da..1e9e292 100644
--- a/debug/_image_clip_setting.py
+++ b/debug/_image_clip_setting.py
@@ -4,7 +4,14 @@
 #image_clip = [176,234,278,422]     # for  video.mp4
 #image_clip = [226,266,200,300]     # for  new.mp4
 #image_clip = [220,275,210,300]     # test image
+<<<<<<< HEAD
 image_clip = [220,275,210,300]  # for 聽7122.mp4
 #image_clip = [255,308,290,412]  # for 聽7222.mp4
 #image_clip = [229,274,270,380]  # for 聽7322.mp4
-#image_clip = [180,240,154,287]   # for 聽7422.mp4
\ No newline at end of file
+#image_clip = [180,240,154,287]   # for 聽7422.mp4
+=======
+#image_clip = [220,275,210,300]  # for 聽7122.mp4
+image_clip = [255,308,290,412]  # for 聽7222.mp4
+#image_clip = [229,274,270,380]  # for 聽7322.mp4
+#image_clip = [180,240,154,287]   # for 聽7322.mp4
+>>>>>>> db44060a8de04f55557badee55cd617392d65c5b

--
Gitblit v1.9.1