Correct readme.md and removed some merge conflict

Author: andersbryrup

AdLibWS.class.inc

@@ -120,11 +120,7 @@ class AdLibWS {
       '!outfolder' => self::$basePath . $file_info['out_folder'],
       '!jobtype' => ($type == ADLIB_JOBTYPE_HTML ? 'HTML' : 'PDF'),
         ));
-<<<<<<< HEAD
-    $result = simplexml_load_string($this->client->addJob(array('jobInfo' => $job_info, 'jobTicket' => $job_ticket))->AddJobResult);
-=======
     $result = simplexml_load_string($this->client->addJob(array('job_info' => $job_info, 'job_ticket' => $job_ticket))->AddJobResult);
->>>>>>> Prod_check module hooks
     if (is_object($result) && isset($result->JobSettings['JobID'])) {
       return $result;
     }

README.md

@@ -1,34 +1,12 @@
-OS2Web Case Publishing service
+OS2Web AdLib API Module
 ==============================
 
 Description
 -----------
-This module provides a service for OS2web that allows providers
-to publish cases and documents directly from their back-end systems.
-Additionally this module includes views, panels and settings to display
-the cases and documents, and uses PathAuto to generate urls.
+Implements calls to allow access to the AdLib webservice
 
 Dependencies
 -----------
-- ctools
-- date
-- date_popup
-- date_views
-- entityreference
-- features
-- list
-- node
-- number
-- options
-- os2web_esdh_provider
-- page_manager
-- panels
-- pathauto
-- strongarm
-- text
-- views
-- views_content
-- views_php
 
 Installation
 -----------
@@ -61,6 +39,3 @@ Additional Info
 ---------------
 This repository should be governed using Git Flow. for more information see
 http://nvie.com/posts/a-successful-git-branching-model/
-
-Note: This module is still dependant on modules in the full OS2Web suite
-(https://github.com/OS2web/os2web), as the seperation of those are still WIP.