Some more link fixes

Changed from external links to internal static links

Author: kengdahl

content/retired/01.boards/arduino-101-619/content.md

@@ -9,11 +9,7 @@ source: "https://store.arduino.cc/arduino-101-619"
 
 ![The Arduino 101 board](./assets/ABX00005_featured_2.jpg)
 
-<<<<<<< Updated upstream
-A learning and development board that delivers the performance and low-power consumption of the [Intel® Curie™](http://www.intel.com/content/dam/support/us/en/documents/boardsandkits/curie/intel-curie-module-datasheet.pdf) Module with the simplicity of Arduino at an entry-level price. It keeps the same robust form factor and peripheral list of the UNO with the addition of onboard Bluetooth® Low Energy capabilities and a 6-axis accelerometer/gyro to help you easily expand your creativity into the connected world. 
-=======
 A learning and development board that delivers the performance and low-power consumption of the [Intel® Curie™](/resources/datasheets/intel-curie-module-datasheet.pdf) Module with the simplicity of Arduino at an entry-level price. It keeps the same robust form factor and peripheral list of the UNO with the addition of onboard Bluetooth LE capabilities and a 6-axis accelerometer/gyro to help you easily expand your creativity into the connected world. 
->>>>>>> Stashed changes
 
 The module contains two tiny cores, an x86 (Quark) and a [32-bit ARC](https://en.wikipedia.org/wiki/ARC_(processor)) architecture core, both clocked at 32MHz. The Intel toolchain compiles your Arduino sketches optimally across both cores to accomplish the most demanding tasks. The Real-Time Operating Systems (RTOS) and framework developed by Intel is open sourced. See below under Firmware for the download link. The Arduino core communicates with the RTOS via static mailboxes to accomplish a predefined list of tasks (interface with PC using USB, program the sketch into flash, expose Bluetooth® Low Energy functionality to sketch, perform PWM). The RTOS for Intel Curie is still under development and new functions and features will be released in the near future.
 

content/retired/01.boards/arduino-BT-v1/content.md

@@ -9,11 +9,8 @@ source: "https://arduino.cc/en/Main/ArduinoBoardBluetoothNew"
 
 ### Overview
 
-<<<<<<< Updated upstream
-The Arduino BT (Bluetooth) is a microcontroller board based on the ATmega168 ([datasheet](/static/resources/datasheets/Datasheet-ATmega48-88-168-doc2545.pdf)) and the Bluegiga WT11 Bluetooth® module [datasheet](/static/resources/datasheets/WT11_Datasheet.pdf) \[pdf\]). It has 14 digital input/output pins (of which 6 can be used as PWM outputs and one can be used to reset the WT11 module), 6 analog inputs, a 16 MHz crystal oscillator, screw terminals for power, an ICSP header, and a reset button. It contains everything needed to support the microcontroller and can be programmed wirelessly over the Bluetooth® connection. Instructions are available for [getting started with the Arduino BT](//www.arduino.cc/en/Guide/ArduinoBT).
-=======
+
 The Arduino BT (Bluetooth®) is a microcontroller board based on the ATmega168 ([datasheet](./static/resources/datasheets/Datasheet-ATmega48-88-168-doc2545.pdf)) and the Bluegiga WT11 Bluetooth® module [datasheet](./static/resources/datasheets/WT11_Datasheet.pdf) \[pdf\]). It has 14 digital input/output pins (of which 6 can be used as PWM outputs and one can be used to reset the WT11 module), 6 analog inputs, a 16 MHz crystal oscillator, screw terminals for power, an ICSP header, and a reset button. It contains everything needed to support the microcontroller and can be programmed wirelessly over the Bluetooth® connection. Instructions are available for [getting started with the Arduino BT](//www.arduino.cc/en/Guide/ArduinoBT).
->>>>>>> Stashed changes
 
 ### Summary
 
@@ -101,11 +98,7 @@ The maximum length and width of the BT are approximately 3.2 and 2.1 inches resp
 
 ## Arduino BT v1 Initialization Sketch
 
-<<<<<<< Updated upstream
-This sketch is run once on each Arduino BT v1 to initialize the Bluetooth® module before the board is shipped (you shouldn't need to run this code; it's just here for reference). For details on the commands sent to the module, see the [iWrap data sheet](http://www.bluegiga.com/iWRAP%5Fsoftware).
-=======
 This sketch is run once on each Arduino BT v1 to initialize the Bluetooth® module before the board is shipped (you shouldn't need to run this code; it's just here for reference). For details on the commands sent to the module, see the [iWrap data sheet](./static/resources/datasheets/UG218.pdf).
->>>>>>> Stashed changes
 
 ```arduino
 /* BT test 01

content/retired/01.boards/arduino-BT/content.md

@@ -11,11 +11,8 @@ source: "https://arduino.cc/en/Main/ArduinoBoardBT"
 
 ### Overview
 
-<<<<<<< Updated upstream
-The Arduino BT is a microcontroller board originally was based on the ATmega168, but now is supplied with the 328P ([datasheet](http://www.atmel.com/devices/atmega328.aspx?tab=documents)) and the Bluegiga WT11 Bluetooth® module ([details](http://www.bluegiga.com/WT11i%5FClass%5F1%5FBluetooth%5FModule) and [datasheet](http://www.bluegiga.com/files/bluegiga/Pub%20files/WT11i%5FProduct%5FBrief%5F140711%5Flores.pdf)). It supports wireless serial communication over Bluetooth® (but is not compatible with Bluetooth® headsets or other audio devices). It has 14 digital input/output pins (of which 6 can be used as PWM outputs and one can be used to reset the WT11 module), 6 analog inputs, a 16 MHz crystal oscillator, screw terminals for power, an ICSP header, and a reset button. It contains everything needed to support the microcontroller and can be programmed wirelessly over the Bluetooth® connection. Instructions are available for [getting started with the Arduino BT](content\retired\06.getting-started-guides\ArduinoBT).
-=======
 The Arduino BT is a microcontroller board originally was based on the ATmega168, but now is supplied with the 328P ([datasheet](./static/resources/datasheets/ATmega48A-PA-88A-PA-168A-PA-328-P-DS-DS40002061B.pdf)) and the Bluegiga WT11 Bluetooth® module [datasheet](./static/resources/datasheets/assets/WT11_Datasheet.pdf)). It supports wireless serial communication over Bluetooth® (but is not compatible with Bluetooth® headsets or other audio devices). It has 14 digital input/output pins (of which 6 can be used as PWM outputs and one can be used to reset the WT11 module), 6 analog inputs, a 16 MHz crystal oscillator, screw terminals for power, an ICSP header, and a reset button. It contains everything needed to support the microcontroller and can be programmed wirelessly over the Bluetooth® connection. Instructions are available for [getting started with the Arduino BT](content\retired\06.getting-started-guides\ArduinoBT).
->>>>>>> Stashed changes
+
 
 ### Summary