From f1c5444e753ad482e1e791dbd4e6a06dc564585d Mon Sep 17 00:00:00 2001
From: owein D <yvain29@gmail.com>
Date: Mon, 5 Oct 2020 14:37:04 +0200
Subject: [PATCH] working algo after a change

---
 bfg.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bfg.h b/bfg.h
index 418b7d4..e6c4733 100644
--- a/bfg.h
+++ b/bfg.h
@@ -46,7 +46,11 @@ typedef struct {
 <<<<<<< HEAD
 =======
   uint64_t rotate;
+<<<<<<< HEAD
 >>>>>>> c65e3a2 (update efficient rain option)
+=======
+  uint64_t strafe;
+>>>>>>> fc82b52 (working algo after a change)
 } bf_option;
 
 extern bf_option bf_options;