Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

missed merge

  • Loading branch information...
commit fbd4914526e7f708ac1b76022202cc469d588b8c 1 parent 8b7277f
@y-trudeau authored
Showing with 1 addition and 3 deletions.
  1. +1 −3 heartbeat/mysql
View
4 heartbeat/mysql
@@ -119,10 +119,8 @@ MYSQL_BINDIR=`dirname ${OCF_RESKEY_binary}`
: ${OCF_RESKEY_evict_outdated_slaves=${OCF_RESKEY_evict_outdated_slaves_default}}
: ${OCF_RESKEY_reader_attribute=${OCF_RESKEY_reader_attribute_default}}
-<<<<<<< HEAD
: ${OCF_RESKEY_reader_failcount=${OCF_RESKEY_reader_failcount_default}}
-=======
->>>>>>> upstream/master
+
#######################################################################
# Convenience variables
Please sign in to comment.
Something went wrong with that request. Please try again.