Dev: question theme documentation update

themes/question/README.md

@@ -19,9 +19,15 @@ Also you should give some information about the used licence (remember LimeSurve
 
 It makes a lot of sense to write which version of the view it is, to let people know If they would have to update.
 
+<<<<<<< refs/remotes/origin/master
 Also, there is a difference between <name> and <title> tags.
 <name> tag is used to enter a question theme code, without spaces.
 <title> tag is used to enter a nice title which would be visible on Question theme dropdown on edit question page.
+=======
+Also, there is a difference between `name` and `title` tags.
+`name` tag is used to enter a question theme code, without spaces.
+`title` tag is used to enter a nice title which would be visible on Question theme dropdown on edit question page.
+>>>>>>> Dev: question theme documentation update
 Both tags are required.
 
 The `metadatas` part should therefore look something like this:
@@ -46,7 +52,11 @@ The `metadatas` part should therefore look something like this:
 
 You can add additional files to the question view. 
 
+<<<<<<< refs/remotes/origin/master
 <preview> tag is used to show a preview image for question type on edit question page right side accordion. If this tag is missing or empty, default question type preview image would be used.
+=======
+`preview` tag is used to show a preview image for question type on edit question page right side accordion. If this tag is missing or empty, default question type preview image would be used.
+>>>>>>> Dev: question theme documentation update
 
 Please make sure, that you put your own files in an `asset` folder in the base folder of your question view.