From 0db6c09ed9f82417b7389da2d5455b6f801b8ef1 Mon Sep 17 00:00:00 2001
From: Laurent chretienneau <laurentc@1504144.no-reply.drupal.org>
Date: Fri, 28 Sep 2012 14:46:51 +0200
Subject: [PATCH] merge test

---
 .../core/pm/exchange/converters/mpx/MpxAssignmentConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projectlibre_exchange/src/com/projectlibre/core/pm/exchange/converters/mpx/MpxAssignmentConverter.java b/projectlibre_exchange/src/com/projectlibre/core/pm/exchange/converters/mpx/MpxAssignmentConverter.java
index 221d8c1..86edfe9 100644
--- a/projectlibre_exchange/src/com/projectlibre/core/pm/exchange/converters/mpx/MpxAssignmentConverter.java
+++ b/projectlibre_exchange/src/com/projectlibre/core/pm/exchange/converters/mpx/MpxAssignmentConverter.java
@@ -113,7 +113,7 @@ public class MpxAssignmentConverter {
 		//convert fields
 		FieldUtil.convertFields(assignment, net.sf.mpxj.ResourceAssignment.class, mpxAssignment, fieldsToConvert, true);
 
-		//timephased
+		// timephased
 		List<TimephasedDataType> mpxRawTimephasedData = state.getMpxTimephasedMap().get(mpxAssignment);
 		if (mpxRawTimephasedData!= null) {
 			DefaultTimephasedValues timephasedValues=new DefaultTimephasedValues();