Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>monroegm-disable-blank-issue-2
commit
d7574777a8
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) Contributors to the Open 3D Engine Project
|
# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
#
|
#
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) Contributors to the Open 3D Engine Project
|
# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
#
|
#
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
"""
|
"""
|
||||||
Copyright (c) Contributors to the Open 3D Engine Project
|
Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
|
||||||
SPDX-License-Identifier: Apache-2.0 OR MIT
|
SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
"""
|
"""
|
||||||
Copyright (c) Contributors to the Open 3D Engine Project
|
Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
|
||||||
SPDX-License-Identifier: Apache-2.0 OR MIT
|
SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
"""
|
"""
|
||||||
Copyright (c) Contributors to the Open 3D Engine Project
|
Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
|
||||||
SPDX-License-Identifier: Apache-2.0 OR MIT
|
SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
"""
|
"""
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue