Fix sample config error (#161)

* Fix error configuring sample DirectoryPollingModule attribs

* Fix missing $

Server/src/config/config.xml

@@ -69,7 +69,11 @@
 		     The name of the file sent to the partner will be "OrderID-745634.edi" -->
 		<module classname="org.openas2.processor.receiver.AS2DirectoryPollingModule"
 			outboxdir="$properties.storageBaseDir$/toAny"
+<<<<<<< HEAD
+			errordir="$properties.storageBaseDir$/toAny/error/$msg.sender.as2_id$-$msg.receiver.as2_id$"
+=======
 			errordir="$properties.storageBaseDir$/toAny/error/$msg.sender.as2_id$-$msg.receiver.as2_id"
+>>>>>>> branch 'master' of https://uhurusurfa@github.com/OpenAS2/OpenAs2App.git
 			interval="5"
 			delimiters="-"
 			mergeextratokens="true"
@@ -82,7 +86,11 @@
 			outboxdir="$properties.storageBaseDir$/toPartnerA/"
 			errordir="$properties.storageBaseDir$/toPartnerA/error/$date.YYYY$/$date.MM$"
 			stored_error_filename="$msg.attributes.filename$-$date.YYYY$-$date.MM$-$msg.headers.message-id$"
+<<<<<<< HEAD
+			sentdir="$properties.storageBaseDir$/$msg.sender.as2_id$-$msg.receiver.as2_id$/sent/$date.YYYY$/$date.MM$"
+=======
 			sentdir="$properties.storageBaseDir$/$msg.sender.as2_id$-$msg.receiver.as2_id/sent/$date.YYYY$/$date.MM$"
+>>>>>>> branch 'master' of https://uhurusurfa@github.com/OpenAS2/OpenAs2App.git
 			stored_sent_filename="$msg.attributes.filename$-$msg.headers.message-id$"
 			interval="5"
 			defaults="sender.as2_id=MyCompany_OID, receiver.as2_id=PartnerA_OID"