Fix conflict

Signed-off-by: Ben Rockwood <[email protected]>
mondoohq · Sep 20, 2023 · fa964f7 · fa964f7
1 parent d069902
commit fa964f7
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 39 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-# Copyright:: Mondoo, Inc.
+# Copyright (c) Mondoo, Inc.
 # SPDX-License-Identifier: BUSL-1.1
-=======
-# Copyright:: 2021-2023 Mondoo, Inc
-# License:: BUSL-1.1
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 
 source 'https://rubygems.org'
 

diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright:: Mondoo, Inc.
-=======
 # Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 ---

diff --git a/kitchen.yml b/kitchen.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# Copyright:: (c) Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
+# Copyright:: Mondoo, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
 ---

diff --git a/metadata.rb b/metadata.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright:: Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 name 'mondoo'

diff --git a/spec/recipes/default_spec.rb b/spec/recipes/default_spec.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright:: Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 require 'spec_helper'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright:: Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 require 'chefspec'

diff --git a/test/cookbooks/mondoo-test/metadata.rb b/test/cookbooks/mondoo-test/metadata.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright:: Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 name 'mondoo-test'

diff --git a/test/cookbooks/mondoo-test/recipes/default.rb b/test/cookbooks/mondoo-test/recipes/default.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright:: Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 # see https://docs.chef.io/environment_variables.html

diff --git a/test/integration/default/default_test.rb b/test/integration/default/default_test.rb
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright:: Mondoo, Inc.
-=======
-# Copyright (c) Mondoo, Inc.
->>>>>>> 8309bcbf980064d3bab9236e47d293ef8d4639bd
 # SPDX-License-Identifier: BUSL-1.1
 
 # InSpec test for recipe mondoo::default