Merge clean up.

jdcockrill · Aug 17, 2011 · 356e3e7 · 356e3e7
1 parent 1247395
commit 356e3e7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/RF24.h b/RF24.h
@@ -204,7 +204,6 @@ class RF24
    */
   void toggle_features(void);
   /**@}*/
->>>>>>> 5344c5fe8cefaafa1a267267e7edefec631603d9
 
 public:
   /**