fixed merge conflicts

static/css/pad.css

@@ -1162,7 +1162,6 @@ label[for=readonlyinput] {
   margin-left:10px;
 }
 
-
 @media screen and (max-width: 960px) {
   .modaldialog {
     position: relative;
@@ -1251,3 +1250,6 @@ label[for=readonlyinput] {
     display:none;
   }
 }
+.rtl{
+  direction:RTL;
+} 

static/js/ace2_inner.js

@@ -1127,6 +1127,10 @@ function OUTER(gscope)
     {
       setTextSize(value);
     }
+    else if (k == 'rtlistrue')
+    {
+      setClassPresence(root, "rtl", !! value);
+    }
   }
 
   editorInfo.ace_setBaseText = function(txt)

static/js/pad2.js

@@ -22,6 +22,7 @@ var noColors = false;
 var useMonospaceFontGlobal = false;
 var globalUserName = false;
 var hideQRCode = false;
+var rtlIsTrue = false;
 
 $(document).ready(function()
 {
@@ -88,6 +89,7 @@ function getParams()
   var useMonospaceFont = params["useMonospaceFont"];
   var IsnoColors = params["noColors"];
   var hideQRCode = params["hideQRCode"];
+  var rtl = params["rtl"];
 
   if(IsnoColors)
   {
@@ -135,6 +137,13 @@ function getParams()
   {
     $('#qrcode').hide();
   }
+  if(rtl)
+  {
+    if(rtl == "true")
+    {
+      rtlIsTrue = true
+    }
+  }
 }
 
 function getUrlVars()
@@ -294,6 +303,11 @@ function handshake()
         pad.changeViewOption('noColors', true);
       }
       
+      if (rtlIsTrue == true)
+      {
+        pad.changeViewOption('rtl', true);
+      }
+
       // If the Monospacefont value is set to true then change it to monospace.
       if (useMonospaceFontGlobal == true)
       {

static/js/pad_editor.js

@@ -89,6 +89,7 @@ var padeditor = (function()
 
       self.ace.setProperty("showsauthorcolors", noColors);
 
+      self.ace.setProperty("rtlIsTrue", rtlIsTrue);
     },
     initViewZoom: function()
     {