abarger/CONNECT — pull request #3 by bhumphrey (2013-01-15 15:17:58+00:00)
Title: Corrected merge conflicts for pull 188

You should be able to accept this pull request and then submit a pull request from your 3.3_Integration back to CONNECT-Solution/3.3_Integration

I reset your branch back to commit 494d58062af21bea15ee1fc67b4feb4a35f4245f and then updated it with origin/3.3_integration. After which I replayed your commits on the updated 3.3_integration branch.

* 47a9294 (HEAD, merge-issues) Updated the documentation to reflect the updated appserver paths. Also, removed references to the MIDHT project. abarger, 3 months ago
* 91aa420 Updated the documentation to reflect the updated appserver paths. Also, removed references to the MIDHT project. abarger, 3 months ago
* 61bef50 Removed references to the MIDHT project, correct the version number of OpenDS & Connect and updated references to the user that gets created by following the instructions. abarger, 3 months ago
* 13daf75 Bundle.properties is no longer used and has been removed from the project. abarger, 3 months ago
* 959bcba The initial commit of the Dynamic Document Generation plug-in source code and supporting files. abarger, 3 months ago
* f7f73db Initial commit of the AdapterCommonDataLayerEJB files abarger, 4 months ago
* d7b3c36 Initial commit of CONNECT v3.3.1 compliant CONNECTUniversalClientGUI code abarger, 5 months ago
* 5b9ece6 Initial commit for the AdapterDocumentRepositoryEJB project abarger, 5 months ago
* 5ae0ff6 Initial commit for the AdapterDocumentRepository project abarger, 5 months ago
* dc19948 Initial commit of the AdapterMpiEJB abarger, 5 months ago
* ca4f916 Initial commit for the TemplateManager project abarger, 5 months ago
* f119057 Initial commit NHINAdapterServiceEJB abarger, 5 months ago
* 7e683be Initial commit of the DocumentManagerEJB project abarger, 5 months ago
* 836929d Initial commit for the DocumentAssemblyManagerEJB project abarger, 5 months ago
* e319f5b Initial Commit of the AdapterDocumentAssemblyProxy EJB project abarger, 5 months ago
* 7b1c6af Initial Commit of the AdapterCommonDataLayerEJB abarger, 5 months ago
* 011920e Merge remote-tracking branch 'origin/3.3_integration' into merge-issues Brian Humphrey, 10 minutes ago