aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--pepperbacon.brdbin94801 -> 89976 bytes
-rw-r--r--pepperbacon.schbin146641 -> 159647 bytes
3 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..26c289e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.brd binary merge=useTheirs
+*.sch binary merge=useTheirs
diff --git a/pepperbacon.brd b/pepperbacon.brd
index f7db1fa..565c07b 100644
--- a/pepperbacon.brd
+++ b/pepperbacon.brd
Binary files differ
diff --git a/pepperbacon.sch b/pepperbacon.sch
index 74d5eea..29c9945 100644
--- a/pepperbacon.sch
+++ b/pepperbacon.sch
Binary files differ