fixed merge error

Author: micheldumontier

Diff for: chembl/chembl.php

@@ -1017,8 +1017,10 @@ function compounds($connection) {
 				}
 				parent::writeRDFBufferToWriteFile();
 			}
+		}
+		$result->free();
+	}
 
-<<<<<<< HEAD
 	/*
 	*	parse the assays tables
 	*/
@@ -1075,12 +1077,8 @@ function process_assays() {
 		     $this->WriteRDFBufferToWriteFile();
 
 		  }
-
 		  $this->AddRDF($this->QQuad($assay,"chembl_vocabulary:hasAssayType","chembl_vocabulary:".$row['assay_desc']));
 		  $this->WriteRDFBufferToWriteFile();
-=======
-			$result->free();
->>>>>>> release3
 		}
 	}