Minor docs fixes.

Signed-off-by: Ian Maddaus <Ian.Maddaus@progress.com>

docs-chef-io/content/inspec/resources/chrony_conf.md

@@ -46,7 +46,6 @@ The following examples show how to use this Chef InSpec audit resource.
 
 This resource matches any service listed in the `chrony.conf` file.
 
-<<<<<<< HEAD
 ### Test for clock drift against named servers
 
 ```ruby
@@ -71,32 +70,6 @@ describe chrony_conf do
 end
 ```
 
-=======
-### Test for clock drift against named servers.
-
-```ruby
-describe chrony_conf do
-  its('driftfile') { should cmp '/var/lib/chrony/drift' }
-  its('server') do
-    should cmp [
-      '0.ubuntu.pool.ntp.org',
-      '1.ubuntu.pool.ntp.org',
-      '2.ubuntu.pool.ntp.org'
-      ]
-    end
-end
-```
-
-### Test that an NTP server exists and a specific subnet is specified from which NTP clients are allowed access.
-
-```ruby
-describe chrony_conf do
-  its('server') { should_not eq nil }
-  its('allow') { should include '192.168.0.0/16'}
-end
-```
-
->>>>>>> daa9d77766c9283c2e0fd84dedc65263f2df2907
 ## Matchers
 
  For a full list of available matchers, please visit our [matchers page](/inspec/matchers/).

docs-chef-io/content/inspec/resources/google_project_alert_policy.md

@@ -32,15 +32,15 @@ end
 
 ### Test that a GCP alert policy is enabled
 
-describe google_project_alert_policy(policy: 'spaterson', name: '9271751234503117449') do
-  it { should be_enabled }
-end
+  describe google_project_alert_policy(policy: 'spaterson', name: '9271751234503117449') do
+    it { should be_enabled }
+  end
 
 ### Test that a GCP compute alert policy display name is correct
 
-describe google_project_alert_policy(policy: 'spaterson-project', name: '9271751234503117449') do
-  its('display_name') { should eq 'policy name' }
-end
+  describe google_project_alert_policy(policy: 'spaterson-project', name: '9271751234503117449') do
+    its('display_name') { should eq 'policy name' }
+  end
 
 ## Properties
 
@@ -55,11 +55,11 @@ Properties that can be accessed from the `google_project_alert_policy` resource:
 `combiner`
 : How to combine the results of multiple conditions to determine if an incident should be opened.
 
-Possible values:
+  Possible values:
 
-- AND
-- OR
-- AND_WITH_MATCHING_RESOURCE
+  - AND
+  - OR
+  - AND_WITH_MATCHING_RESOURCE
 
 `creation_record`
 : A read-only record of the creation of the alerting policy. If provided in a call to create or update, this field will be ignored.