Update rstudio to 1.3.1056

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-rstudio

 #!/bin/bash
 
 #RSTUDIO=https://download1.rstudio.org/desktop/debian9/x86_64/rstudio-1.2.1335-amd64.deb
-RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.959-amd64.deb
+#RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.959-amd64.deb
+RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.1056-amd64.deb
 
 gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
 apt-get -qq update

2020.1/aims-desktop/aims-desktop-2020/debian/changelog

-<<<<<<< HEAD
-aims-desktop (1:2020.64) buster; urgency=medium
+aims-desktop (1:2020.65) buster; urgency=medium
 
-  * Update rtl installer script
+  * Update rstudio to 1.3.1056
+
+ -- Jan Groenewald <jan@aims.ac.za>  Fri, 31 Jul 2020 07:53:20 +0000
 
- -- Jonathan Carter <jonathan@aims.ac.za>  Tue, 10 Sep 2019 10:49:41 +0000
-=======
 aims-desktop (1:2020.73) buster; urgency=medium
 
   * Update rstudio to 1.3.959
@@ -59,12 +58,17 @@ aims-desktop (1:2020.65) buster; urgency=medium
 
  -- Jan Groenewald <jan@aims.ac.za>  Wed, 11 Sep 2019 07:42:21 +0000
 
-aims-desktop (1:2020.64) buster; urgency=medium
+aims-desktop (1:2020.641) buster; urgency=medium
 
   * Add aims-install-irkernel for buster for comiling against newer R
 
  -- Jan Groenewald <jan@aims.ac.za>  Wed, 11 Sep 2019 06:42:14 +0000
->>>>>>> 969c6ac74e1e6620e6eeef535d528501ba1eec08
+
+aims-desktop (1:2020.64) buster; urgency=medium
+
+  * Update rtl installer script
+
+ -- Jonathan Carter <jonathan@aims.ac.za>  Tue, 10 Sep 2019 10:49:41 +0000
 
 aims-desktop (1:2020.63) unstable; urgency=medium