Revision 1b70db0d docs/examplesdir/imageregister.rst

b/docs/examplesdir/imageregister.rst
66 66 
the image file and then register it as an image, and is equivalent to
67 67 
sequentially calling **/file upload** and **/image register**.
68 68 

  		





  69
  
  
    
<<<<<<< HEAD:docs/collection_of_examples/imageregister.rst


  		





  70
  
  
    
In other words, the example that follows is equivalent to calling the two


  		





  71
  
  
    
operations above.


  		





  72
  
  
    
=======


  		





  73
  69
  
    
In other words, the preceding and following command sequences are equivalent.


  		





  74
  
  
    
>>>>>>> release-0.11:docs/examplesdir/imageregister.rst


  		





  75
  70
  
    

  		





  76
  71
  
    
.. code-block:: console


  		





  77
  72
  
    

  		












Also available in:
  Unified diff