fix conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/resource.c b/src/resource.c
index 844cb1d3..1598c7b2 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -1,7 +1,7 @@
 /*
  * resource.c
  *
- * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
  *
  * This file is part of Profanity.
  *
@@ -46,7 +46,7 @@ Resource * resource_new(const char * const name, resource_presence_t presence,
     Resource *new_resource = malloc(sizeof(struct resource_t));
     new_resource->name = strdup(name);
     new_resource->presence = presence;
-    if (status != NULL) {
+    if (status) {
         new_resource->status = strdup(status);
     } else {
         new_resource->status = NULL;
@@ -88,7 +88,7 @@ resource_compare_availability(Resource *first, Resource *second)
 
 void resource_destroy(Resource *resource)
 {
-    if (resource != NULL) {
+    if (resource) {
         free(resource->name);
         free(resource->status);
         free(resource);