diff --git a/change_policy.html b/change_policy.html index 54cf4d3..234be1a 100644 --- a/change_policy.html +++ b/change_policy.html @@ -1,4 +1,8 @@ +<<<<<<< HEAD +======= + +>>>>>>> 3f4250f44d233b1ab4b22dc0864b9b2ff4d7949f diff --git a/downloads/SimpleDwCMSAccess.mdb b/downloads/SimpleDwCMSAccess.mdb deleted file mode 100644 index 90f5036..0000000 Binary files a/downloads/SimpleDwCMSAccess.mdb and /dev/null differ diff --git a/examples/index.html b/examples/index.html index 5961449..2f0aafc 100644 --- a/examples/index.html +++ b/examples/index.html @@ -70,7 +70,10 @@

Following are links to examples of marking up data in Darwin Core:

+<<<<<<< HEAD +======= +>>>>>>> 3f4250f44d233b1ab4b22dc0864b9b2ff4d7949f