Clean merge from 5.0

Author: Mr-Dave

.github/ISSUE_TEMPLATE/config.yml

@@ -5,8 +5,4 @@ contact_links:
     about: Please ask and answer questions here.
   - name: Motion Enhancements
     url: https://github.com/Motion-Project/motion/discussions
-<<<<<<< HEAD
     about: Please use the discussions page and tag as an enhancement request.
-=======
-    about: Please use the discussions page and tag as an enhancement request.
->>>>>>> 5.0

.github/ISSUE_TEMPLATE/issue.yml

@@ -22,23 +22,12 @@ body:
       label: What is the base version number of Motion being used?
       multiple: false
       options:
-        - 4.0.x
-        - 4.1.x
-        - 4.2.x
-        - 4.3.x
-        - 4.4.x
-        - 4.5.x
-        - 4.6.x
-        - 4.7.x
-<<<<<<< HEAD
-        - 4.8.x
-        - 4.9.x
-        - 4.10.x
-=======
-        - 5.0.x
-        - 5.1.x
-        - 5.2.x
->>>>>>> 5.0
+        - 0.0.x
+        - 0.1.x
+        - 0.2.x
+        - 0.3.x
+        - 0.4.x
+        - 0.5.x
     validations:
       required: true
   - type: dropdown
@@ -59,11 +48,7 @@ body:
       options:
         - ARM-32bit
         - ARM-64bit
-<<<<<<< HEAD
-        - x86
-=======
         - x86/x64
->>>>>>> 5.0
         - Other
     validations:
       required: true
@@ -90,17 +75,6 @@ body:
   - type: dropdown
     id: camtype
     attributes:
-<<<<<<< HEAD
-      label: Camera type(s) being used?
-      multiple: true
-      options:
-        - v4l2 USB camera
-        - v4l2 capture card
-        - PI cam via libcamerify
-        - PI cam via MMAL
-        - Network camera with RTSP
-        - Network camera with HTTP
-=======
       label: Camera/Sound type(s) being used?
       multiple: true
       options:
@@ -111,7 +85,6 @@ body:
         - Network camera with HTTP
         - Sound via ALSA
         - Sound via PulseAudio
->>>>>>> 5.0
         - Other
     validations:
       required: true
@@ -126,13 +99,8 @@ body:
   - type: textarea
     id: logs
     attributes:
-<<<<<<< HEAD
-      label: Motion log output at log_level 8
-      description: Provide the entire log output from Motion start up to when the issue occurs so we can see the parameters.  This will be automatically formatted into code, so no need for backticks.
-=======
-      label: Full Motion log output (at log_level 8)
-      description: Please copy and paste the full log output. This will be automatically formatted into code, so no need for backticks.
->>>>>>> 5.0
+      label: Relevant Motion log output (at log_level 8)
+      description: Please copy and paste the log output. This will be automatically formatted into code, so no need for backticks.
       render: shell
     validations:
       required: true

.gitignore

@@ -3,20 +3,15 @@ Makefile.in
 ABOUT-NLS
 compile
 config.guess
-<<<<<<< HEAD
-config.h
-config.h.in
-config.h.in~
-=======
 config.hpp
 config.hpp.in
 config.hpp.in~
->>>>>>> 5.0
 config.log
 config.rpath
 config.status
 config.sub
 configure
+configure~
 autom4te.cache
 aclocal.m4
 depcomp
@@ -26,20 +21,12 @@ missing
 stamp-h1
 
 #data
-<<<<<<< HEAD
-data/motion.service
-=======
 data/motion-dist.service
->>>>>>> 5.0
 data/motion-dist.conf
 data/camera1-dist.conf
 data/camera2-dist.conf
 data/camera3-dist.conf
-<<<<<<< HEAD
-data/camera4-dist.conf
-=======
 data/sound1-dist.conf
->>>>>>> 5.0
 
 #src
 src/*.o
@@ -49,12 +36,6 @@ src/Makefile.in
 src/.deps/
 src/Makefile
 src/Makefile.in
-<<<<<<< HEAD
-src/raspicam/*.o
-src/raspicam/.dirstamp
-src/raspicam/.deps/
-=======
->>>>>>> 5.0
 *.log
 .depend
 

CONTRIBUTING.md

@@ -2,13 +2,11 @@
 
 Issues on the github site are intended to discuss code problems, crashes and application enhancements.  The discussions is intended for questions after you have read the guide.
 
-<<<<<<< HEAD
   * User guide:  [Motion User Guide](https://motion-project.github.io/motion_guide.html)
-  * User Group List:  Please sign-up and send your issue to the list [Motion User](https://lists.sourceforge.net/lists/listinfo/motion-user)  
+  * User Group List:  Please sign-up and send your issue to the list [Motion User](https://lists.sourceforge.net/lists/listinfo/motion-user)
   * IRC:  [#motion](ircs://irc.libera.chat:6697/motion) on Libera Chat
-=======
+
 ##  Questions submitted as issues
->>>>>>> 5.0
 
 Questions that are submitted as a github issue will be transferred to the discussions section.