Merge pull request particle-iot#244 from bgrimes/patch-1

Fix merge conflict in examples.md

Author: kennethlimcp

src/content/guide/getting-started/examples.md

@@ -998,17 +998,6 @@ int tinkerAnalogRead(String pin)
 	return -2;
 }
 
-<<<<<<< HEAD
-**Also**, check out and join our [community forums](http://community.particle.io/) for advanced help, tutorials, and troubleshooting.
-
-{{#if photon}}
-[Go to Community Forums >](http://community.particle.io/c/troubleshooting)
-{{/if}}
-
-{{#if core}}
-[Go to Community Forums >](http://community.particle.io/c/troubleshooting)
-{{/if}}
-=======
 /*******************************************************************************
  * Function Name  : tinkerAnalogWrite
  * Description    : Writes an analog value (PWM) to the specified pin
@@ -1040,4 +1029,13 @@ int tinkerAnalogWrite(String command)
 	else return -2;
 }
 </code></pre>
->>>>>>> master
+
+**Also**, check out and join our [community forums](http://community.particle.io/) for advanced help, tutorials, and troubleshooting.
+
+{{#if photon}}
+[Go to Community Forums >](http://community.particle.io/c/troubleshooting)
+{{/if}}
+
+{{#if core}}
+[Go to Community Forums >](http://community.particle.io/c/troubleshooting)
+{{/if}}