commit d56ddcc5f8cdbfb0762d1b9a104e42f6c7b0ff67 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Tue Oct 2 08:11:56 2018 -0500 fix merge conflict sources | 4 ---- 1 file changed, 4 deletions(-) --- diff --git a/sources b/sources index ee30735..56949e4 100644 --- a/sources +++ b/sources @@ -1,7 +1,3 @@ 9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz 86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz -<<<<<<< HEAD -020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz -======= 7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz ->>>>>>> master