integration fix: bad #if #endif position

37a18b25 · Cedric Roux · af676180 · 37a18b25
Commit 37a18b25 authored Jan 20, 2017 by Cedric Roux
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

openair1/PHY/MODULATION/beamforming.c openair1/PHY/MODULATION/beamforming.c +1 -1

No files found.
--- 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;
 }