fix build errors from merge

Author: joelfmrodrigues

src/controls/fieldCollectionData/collectionDataItem/CollectionDataItem.tsx

@@ -16,7 +16,7 @@ import { CollectionIconField } from '../collectionIconField';
 import { clone, findIndex, sortBy } from '@microsoft/sp-lodash-subset';
 import { Guid } from '@microsoft/sp-core-library';
 import { FieldValidator } from '../FieldValidator';
-import { DatePicker } from 'office-ui-fabric-reac/lib/DatePicker';
+import { DatePicker } from 'office-ui-fabric-react/lib/DatePicker';
 import { IPersonaProps } from 'office-ui-fabric-react/lib/Persona';
 
 export class CollectionDataItem extends React.Component<ICollectionDataItemProps, ICollectionDataItemState> {

src/webparts/controlsTest/components/ControlsTest.tsx

@@ -2053,9 +2053,9 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
               { id: "Field2", title: "Number field", type: CustomCollectionFieldType.number },
               { id: "Field3", title: "URL field", type: CustomCollectionFieldType.url },
               { id: "Field4", title: "Boolean field", type: CustomCollectionFieldType.boolean },
-              { 
+              {
                 id: "Field5", title: "People picker", type: CustomCollectionFieldType.peoplepicker, required: true,
-                minimumUsers: 2, minimumUsersMessage: "2 Users is the minimum", maximumUsers: 3, 
+                minimumUsers: 2, minimumUsersMessage: "2 Users is the minimum", maximumUsers: 3,
               },
               {
                 id: "Field6", title: "Combo Single", type: CustomCollectionFieldType.combobox, required: true,
@@ -2064,7 +2064,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
               {
                 id: "Field7", title: "Combo Multi", type: CustomCollectionFieldType.combobox,
                 allowFreeform: true, multiSelect: true, options: [{key: "choice 1", text: "choice 1"}, {key: "choice 2", text: "choice 2"}, {key: "choice 3", text: "choice 3"}]
-              },              
+              },
               { id: "Field8", title: "Date field", type: CustomCollectionFieldType.date, placeholder: "Select a date" }
             ]}
             value={this.getRandomCollectionFieldData()}
@@ -2669,15 +2669,15 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
 
       const sampleDate = new Date();
       sampleDate.setDate(sampleDate.getDate() + i);
-      
-      result.push({ 
-          "Field1": `String${i}`, 
-          "Field2": i, 
-          "Field3": "https://pnp.github.io/", 
-          "Field4": true,  
+
+      result.push({
+          "Field1": `String${i}`,
+          "Field2": i,
+          "Field3": "https://pnp.github.io/",
+          "Field4": true,
           "Field5": null,
           "Field6": {key: "choice 1", text: "choice 1"},
-          "Field7": [{key: "choice 1", text: "choice 1"}, {key: "choice 2", text: "choice 2"}]
+          "Field7": [{key: "choice 1", text: "choice 1"}, {key: "choice 2", text: "choice 2"}],
           "Field8": sampleDate
         });
     }