After rebasing to the 'fedora/26/x86_64/testing/atomic-host' branch on F26 Atomic Host, our automated tests are encountering the error message in the summary when trying to run Docker containers.

It looks like there were some 'diff' comments left in the '/etc/docker/seccomp.json' file; see below:


# rpm-ostree status
State: idle
Deployments:
● fedora-atomic:fedora/26/x86_64/testing/atomic-host
                   Version: 26.150 (2017-10-30 17:01:58)
                    Commit: 8ceb3dbf64fd39fed090b12aef68a78aafc7d2ca0161ba373806aa38ec73eaf4
              GPGSignature: Valid signature by E641850B77DF435378D1D7E2812A6B4B64DAB85D

# rpm -q docker
docker-1.13.1-36.git8fd0ebb.fc26.x86_64

# docker run --rm docker.io/busybox echo hello                               
/usr/bin/docker-current: Error response from daemon: linux seccomp: Decoding seccomp profile failed: invalid character '<' after object key:value pair.


# docker info | grep seccomp
 seccomp
  WARNING: You're not using the default seccomp profile
  Profile: /etc/docker/seccomp.json


# tail /etc/docker/seccomp.json 
                                ]
                        },
                        "excludes": {}
                }
        ]
<<<<<<< HEAD
}
=======
}
>>>>>>> 8c0a435... docker-2:1.13.1-35.git8fd0ebb