Resolve Conflicts

rajithv · rajithv · commit d4204cc9d25b · 2016-03-06T11:45:23.000+05:30
diff --git a/ext/symengine/ruby_function.c b/ext/symengine/ruby_function.c
@@ -19,11 +19,7 @@ VALUE cfunction_onearg(void (*cwfunc_ptr)(basic_struct*, const basic_struct*), V
 
 #define IMPLEMENT_ONE_ARG_FUNC(func) \
 VALUE cfunction_ ## func(VALUE self, VALUE operand1) { \
-<<<<<<< HEAD
     return cfunction_onearg(basic_ ## func, operand1); \
-=======
-    return cfunction_func(basic_ ## func, operand1); \
->>>>>>> 9a4b4c7... Ruby wrappers for one argument functions
 }
 
 IMPLEMENT_ONE_ARG_FUNC(abs);
diff --git a/symengine_version.txt b/symengine_version.txt
@@ -1 +1,2 @@
 b41eaa38906f357a52624ba8eaa5ccec4b82edd4
+
