From 37a18b25305082549b02cef5b32e6063bcd8bc5b Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Fri, 20 Jan 2017 17:22:43 +0100
Subject: [PATCH] integration fix: bad #if #endif position

---
 openair1/PHY/MODULATION/beamforming.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openair1/PHY/MODULATION/beamforming.c b/openair1/PHY/MODULATION/beamforming.c
index 0e53f7e062..038517f692 100644
--- a/openair1/PHY/MODULATION/beamforming.c
+++ b/openair1/PHY/MODULATION/beamforming.c
@@ -115,9 +115,9 @@ int beam_precoding(int32_t **txdataF,
         }
       }*/
 >>>>>>> enhancement-192-beamforming
-#endif
 
     }
   }
+#endif
   return 0;
 }