fixed extra paste

This commit is contained in:
climbalima 2016-11-14 23:05:37 -05:00 committed by GitHub
parent ec0db2933c
commit dd22c787b8

View File

@ -105,7 +105,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "rev2/config.h" #include "rev2/config.h"
#endif #endif
#endif #endif
=======
#endif
>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d