analogdevicesinc
diff --git a/‎Examples/MAX32672/EEPROM_Emulator/README.md
Lines changed: 0 additions & 8 deletions b/‎Examples/MAX32672/EEPROM_Emulator/README.md
Lines changed: 0 additions & 8 deletions
diff --git a/‎Examples/MAX78002/QSPI-Tom/.vscode/README.md
Lines changed: 0 additions & 547 deletions b/‎Examples/MAX78002/QSPI-Tom/.vscode/README.md
Lines changed: 0 additions & 547 deletions
diff --git a/‎Examples/MAX78002/QSPI-Tom/README.md
Lines changed: 0 additions & 57 deletions b/‎Examples/MAX78002/QSPI-Tom/README.md
Lines changed: 0 additions & 57 deletions
diff --git a/‎Libraries/Cordio/docs/CORDIO_USERGUIDE.md
Lines changed: 41 additions & 41 deletions b/‎Libraries/Cordio/docs/CORDIO_USERGUIDE.md
Lines changed: 41 additions & 41 deletions
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32520/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32520/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32520/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32520/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32572/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32572/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32650/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32650/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32650/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32650/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32655/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32655/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32655/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32655/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32660/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32660/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32660/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32660/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32662/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32662/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32662/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32662/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32665/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32665/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32665/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32665/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32670/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32670/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32670/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32670/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32672/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32672/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32672/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32672/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32675/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32675/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32675/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32675/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32680/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32680/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32680/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32680/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32690/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32690/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX32690/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX32690/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX78000/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX78000/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX78000/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX78000/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX78002/hardfp/libPeriphDriver_hardfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX78002/hardfp/libPeriphDriver_hardfp.a
0 Bytes
diff --git a/‎Libraries/PeriphDrivers/bin/MAX78002/softfp/libPeriphDriver_softfp.a
0 Bytes b/‎Libraries/PeriphDrivers/bin/MAX78002/softfp/libPeriphDriver_softfp.a
0 Bytes
diff --git a/‎USERGUIDE.md
Lines changed: 169 additions & 169 deletions b/‎USERGUIDE.md
Lines changed: 169 additions & 169 deletions
@@ -53,15 +53,7 @@ Universal instructions on building, flashing, and debugging this project can be
 
 (None - this project builds as a standard example)
 
-<<<<<<< HEAD
 ## Required Connections
-=======
-<<<<<<< HEAD
-## Setup
-=======
-## Required Connections
->>>>>>> e2123137437ec80a567376776d46e55a3ca5a253
->>>>>>> release
 
 -   Connect a USB cable between the PC and the CN1 (USB/PWR) connector.
 -   Select RX0 and TX0 on Headers JP10 and JP11 (UART 0).