integration fix: bad #if #endif position

1b8ddefb · Cedric Roux · 4ee0cb09 · 1b8ddefb
Commit 1b8ddefb authored Jan 20, 2017 by Cedric Roux
Hide 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;
 }