Changeset dc22931 in orbit for iOS/Orbit/tutorial/step10.html


Ignore:
Timestamp:
08/25/13 23:53:21 (9 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo, Tab_Interface, pyramid
Children:
47ed41d
Parents:
835f156
Message:

Tutorial:

  • cleanup following merge
File:
1 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/tutorial/step10.html

    r835f156 rdc22931  
    1212      </center> 
    1313       
    14 <<<<<<< HEAD 
    1514      <ul> 
    1615         <li>In the event of a crash or if the propellers make contact with some object the Orbit will enter "safety model" and shut down 
     
    3231      <a class='contents button' onclick="parent.changePage('contents.html');">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a> 
    3332      <a class='next button' onclick="parent.changePage('faq.html');">&nbsp;&nbsp; &rarr; &nbsp;&nbsp;</a> 
    34 ======= 
    35       <table class='table'> 
    36          <tbody> 
    37             <tr> 
    38                <td> 
    39                    
    40                   <center> 
    41                      <img src="tutorial-01-orbit.jpg" width="100%"> 
    42                   </center> 
    43                    
    44                </td> 
    45                <tr> 
    46                   <td> 
    47                      <a class='prev button' onclick="parent.changePage('step09.html');">&laquo; Back</a> 
    48                      <a class='next button' onclick="parent.changePage('index.html');">Restart &raquo;</a> 
    49                   </td> 
    50                </tr> 
    51                </tbody> 
    52       </table> 
    53 >>>>>>> 066b06095b4ed65dac09640759c874d385be55ba 
    5433       
    5534   </body> 
Note: See TracChangeset for help on using the changeset viewer.