Index: DGDefs.h
===================================================================
diff -u -r53ba6201c60349c644bec937cd446992447c4bf7 -rdabe726cd1202e0ab9f9889610d335cde7d3f8ed
--- DGDefs.h	(.../DGDefs.h)	(revision 53ba6201c60349c644bec937cd446992447c4bf7)
+++ DGDefs.h	(.../DGDefs.h)	(revision dabe726cd1202e0ab9f9889610d335cde7d3f8ed)
@@ -1,23 +1,13 @@
 /**************************************************************************
 *
-<<<<<<< HEAD
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
-=======
 * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
->>>>>>> staging
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    DGDefs.h
 *
-<<<<<<< HEAD
-* @author (last) Dara Navaei
-* @date (last) 25-Apr-2021
-=======
-* @author  (last)      Dara Navaei
-* @date    (last)      02-May-2022
->>>>>>> staging
+* @date    (last)      14-Jun-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020