1

fabfab1 · Jul 10, 2018 · da40d7f · da40d7f
1 parent d42c1f2
commit da40d7f
Showing 1 changed file with 7 additions and 44 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1,51 +1,12 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <title>BlockGen</title>
-    <meta name="description" content="BlockGen">
-    <meta name="author" content="F. Buccellati">
-    <link rel="stylesheet" type="text/css" href="blockgen.css">
-  </head>
-  <body>
-    <h1 align="center">BlockGen</h1>
-    <p>This website describes <u>BlockGen</u>, a plugin developed for AutoCAD
-      2012 to produce solid 3D blocks from data collected in archaeological
-      contexts. AutoCAD cannot (at least until 2016) produce a 3D solid object
-      given XYZ coordinates for each corner of the block; this plugin provides
-      that functionality.</p>
-    <p>The plugin was written for use in the analysis of the AP Palace at Tell
-      Mozan, ancient Urkesh. The resulting publication, <a href="http://www.undena.com/BM.html#30"
-
-        target="_blank">Three-dimensional Volumetric Analysis in an
-        Archaeological Context</a>, was published in 2016 by <a href="http://www.undena.com/"
-
-        target="_blank">Undena Press</a> within the Bibliotheca Mesopotamica
-      series as an Open Access Monograph.</p>
-    <p>The plugin design and requirements were written by <a href="http://www.federicobuccellati.net/"
-
-        target="_blank">Federico Buccellati</a>, code was written by Steve
-      Kimling of CADfx. The project is Open Source, published on the GitHub
-      platform with versions saved on Zenodo. To cite project, please use DOI of
-      the latest version on Zenodo: <a href="https://zenodo.org/badge/latestdoi/133136534"><img src="https://zenodo.org/badge/133136534.svg" alt="DOI"></a>.</p>
-    <p>If you use the project for a publication, please leave a reference to
-      that publication here.</p>
-    <p><br>
-    </p>
-  </body>
-</html>
-=======
-<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  </head>
+  <body>
     <title>BlockGen</title>
     <meta name="description" content="BlockGen">
     <meta name="author" content="F. Buccellati">
     <link rel="stylesheet" type="text/css" href="blockgen.css">
-  </head>
-  <body>
     <h1 align="center">BlockGen</h1>
     <p>This website describes <u>BlockGen</u>, a plugin developed for AutoCAD
       2012 to produce solid 3D blocks from data collected in archaeological
@@ -60,12 +21,14 @@ <h1 align="center">BlockGen</h1>
       series as an Open Access Monograph.</p>
     <p>The plugin design and requirements were written by <a href="http://www.federicobuccellati.net/"
         target="_blank">Federico Buccellati</a>, code was written by Steve
-      Kimling of CADfx. The project is Open Source, published on the <a href="https://github.com/fabfab1/BlockGen"
+      Kimling of <a href="https://www.cadfx.com/" target="_blank">CADfx</a>.
+      The project is Open Source, published on the <a href="https://github.com/fabfab1/BlockGen"
         target="_blank">GitHub platform</a> with versions saved on Zenodo. To
-      cite project, please use DOI of the latest version on Zenodo <a href="https://zenodo.org/badge/latestdoi/133136534"><img
+      cite project, please use DOI of the latest version on Zenodo: <a href="https://zenodo.org/badge/latestdoi/133136534"><img
           src="https://zenodo.org/badge/133136534.svg" alt="DOI"></a>.</p>
     <p>If you use the project for a publication, please leave a reference to
       that publication <a href="pub.html">here</a>.</p>
+    <p><br>
+    </p>
   </body>
 </html>
->>>>>>> develop