summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclimbalima <climbalima@users.noreply.github.com>2016-11-14 23:05:37 -0500
committerGitHub <noreply@github.com>2016-11-14 23:05:37 -0500
commitdd22c787b8b417df109d2136c76ce496dd7b93e3 (patch)
tree694e8413118034a6457edb1db56e90bc0f99892d
parentec0db2933cc2935a985087a4021f64f2422a3a46 (diff)
downloadqmk_firmware-dd22c787b8b417df109d2136c76ce496dd7b93e3.tar.gz
qmk_firmware-dd22c787b8b417df109d2136c76ce496dd7b93e3.zip
fixed extra paste
-rw-r--r--keyboards/lets_split/config.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index a5394c5e4d..bf04731162 100644
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -105,7 +105,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "rev2/config.h"
#endif
#endif
-=======
-#endif
->>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d
+
+