Update FIX CONFLICTS

051dcc00 · Simone Primarosa · 3d547aab · 051dcc00 · 051dcc00
Commit 051dcc00 authored Aug 24, 2015 by Simone Primarosa
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1333 additions and 641 deletions

conditionals.h MarlinKimbra/conditionals.h +626 -641

conditionals.h.new MarlinKimbra/conditionals.h.new +707 -0

No files found.
--- a/MarlinKimbra/conditionals.h
+++ b/MarlinKimbra/conditionals.h
--- a/MarlinKimbra/conditionals.h.new
+++ b/MarlinKimbra/conditionals.h.new