use ttl tiddlers

.babelrc

@@ -3,9 +3,21 @@
     [
       "@babel/preset-env",
       {
+<<<<<<< HEAD
+        "targets": {
+          "browsers": [
+            ">0.25%",
+            "not ie 11",
+            "not op_mini all"
+          ]
+        }
+      }
+   ]
+=======
         "useBuiltIns": "entry"
       }
     ]
+>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b
   ],
   "plugins": [
     "@babel/plugin-transform-flow-strip-types",

@eaDir/.babelrc/SYNO_DTIME

@@ -0,0 +1 @@
+1605034026

@eaDir/.gitignore/SYNO_DTIME

@@ -0,0 +1 @@
+1548599202

@eaDir/LICENSE/SYNO_DTIME

@@ -0,0 +1 @@
+1605034026

@eaDir/README.md/SYNO_DTIME

@@ -0,0 +1 @@
+1605034125

@eaDir/about.tid/SYNO_DTIME

@@ -0,0 +1 @@
+1605034126

@eaDir/config.tid/SYNO_DTIME

@@ -0,0 +1 @@
+1605034125

@eaDir/main.js/SYNO_DTIME

@@ -0,0 +1 @@
+1605034026

@eaDir/package.json/SYNO_DTIME

@@ -0,0 +1 @@
+1605034125

@eaDir/plugin.info/SYNO_DTIME

@@ -0,0 +1 @@
+1605034125

config.tid

@@ -7,13 +7,45 @@ tags: [[$:/tags/ControlPanel/Saving]]
 !! Choose a container URI to save your tiddlers into.
 !! it should be read/write for your webid.
 
+<<<<<<< HEAD
+|''Pod Name''       | <$edit-text tiddler="$:/plugins/bourgeoa/nodesolidserver/containeruri" tag="input" /> |       for example :    https://xyz.solid.community|
+=======
+>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b
 |''Root Folder''| <$reveal type="nomatch" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">public</$reveal><$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">private</$reveal> |      yes :  public       no :  private|
 |''tiddlers''      |                tiddlers |    not editable|
 |''wiki folder''     | <$edit-text tiddler="$:/plugins/bourgeoa/nodesolidserver/namespace" tag="input" default="main" /> |       main is the default|
 The actual path in your solid server will be:
 
   {{$:/plugins/bourgeoa/node-solid-server/containeruri}}/<$reveal type="nomatch" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">public</$reveal><$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">private</$reveal>/tiddlers/{{$:/plugins/bourgeoa/nodesolidserver/namespace}}
+<<<<<<< HEAD
+
+
+<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="yes-yes">
+    <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="yes-no">
+      You are connected : Make Logout
+    </$button>
+  </$reveal>
+<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="yes-no">
+    <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="yes-yes">
+      You are connected : Stay Logged in
+    </$button>
+ </$reveal>
+<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="no-no" default="no-no">
+    <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="no-yes">
+      You are not logged in : Make Login
+    </$button>
+  </$reveal>
+<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="no-yes">
+    <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="no-no">
+      You are not logged in : stay logged out
+    </$button>
+</$reveal>
+
+
+---"Please close the tiddler to save the path to your Solid Pod."---
+=======
 
 
 ---"Please close the tiddler to save the path to your Solid Pod."---
 -------------------"And reload your browser"------------------------
+>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b