Fix build error introduced by merge conflict.

also fix typo in lwm2m-client-ipso-power.c

Signed-off-by: Abhijit Mahajani <Abhijit.Mahajani@imgtec.com>

Author: Abhijit Mahajani

Makefile.libobjects

@@ -1,8 +1,8 @@
 libobjects_src = lwm2m-client-flow-object.c lwm2m-client-flow-access-object.c lwm2m-client-device-object.c \
                  lwm2m-client-ipso-digital-input.c lwm2m-client-ipso-light-control.c \
                  lwm2m-client-ipso-presence.c lwm2m-client-ipso-temperature.c lwm2m-client-ipso-set-point.c \
-                 lwm2m-client-ipso-barometer.c
-                 lwm2m-client-ipso-power.c
-                 lwm2m-client-ipso-distance.c
-                 lwm2m-client-ipso-concentration.c
+                 lwm2m-client-ipso-barometer.c \
+                 lwm2m-client-ipso-power.c \
+                 lwm2m-client-ipso-distance.c \
+                 lwm2m-client-ipso-concentration.c \
                  lwm2m-client-ipso-humidity.c

lwm2m-client-ipso-power.c

@@ -116,7 +116,7 @@ AwaError PowerObject_DefineObjectsAndResources(AwaStaticClient *awaClient, AwaFl
 {
     PowerStorage.MaxRangeValue = maxRange;
     PowerStorage.MinRangeValue = minRange;
-    strncpy(&PowerStorage.ApplicatioType[0], applicatioType, APPLICATION_TYPE_MAX_LEN);
+    strncpy(&PowerStorage.ApplicationType[0], applicatioType, APPLICATION_TYPE_MAX_LEN);
     AwaError error;
 
     error = AwaStaticClient_DefineObject(awaClient, IPSO_POWER_OBJECT, "Power", 0, 1);
@@ -198,7 +198,7 @@ AwaError PowerObject_DefineObjectsAndResources(AwaStaticClient *awaClient, AwaFl
 
     error = AwaStaticClient_DefineResource(awaClient, IPSO_POWER_OBJECT, IPSO_POWER_APPLICATION_TYPE, "Application type",
         AwaResourceType_String, 0, 1, AwaResourceOperations_ReadOnly);
-    AwaStaticClient_SetResourceStorageWithPointer(awaClient, IPSO_POWER_OBJECT, IPSO_POWER_APPLICATION_TYPE, &PowerStorage.ApplicatioType,
+    AwaStaticClient_SetResourceStorageWithPointer(awaClient, IPSO_POWER_OBJECT, IPSO_POWER_APPLICATION_TYPE, &PowerStorage.ApplicationType,
         APPLICATION_TYPE_MAX_LEN, 0);
     if (error != AwaError_Success)
     {