Resolved merge conflict

1 files changed, 0 insertions, 19 deletions

diff --git a/sourcecodes/k-best/src/varpar.c b/sourcecodes/k-best/src/varpar.c
deleted file mode 100644
index 584799c6..00000000
--- a/sourcecodes/k-best/src/varpar.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "varpar.h"
-
-varset_t parset2varset(int v, varset_t set){
-  varset_t sinkleton = 1U<<v;
-  varset_t mask      = sinkleton - 1;
-  varset_t low       = set &  mask;
-  varset_t high      = set & ~mask;
-  return (high<<1) | low;
-}
-
-varset_t varset2parset(int v, varset_t set){
-  /* assumes v not set */
-  varset_t sinkleton = 1U<<v;
-  varset_t mask      = sinkleton - 1;
-  varset_t low       = set &  mask;
-  varset_t high      = set & ~mask;
-  return (high>>1) | low;
-}
-