Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
PrettyBoyCosmo committed Sep 11, 2022
2 parents 0dcb2e7 + e01831b commit 1f1a98d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 28 deletions.
40 changes: 13 additions & 27 deletions .obsidian/workspace
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,12 @@
"type": "split",
"children": [
{
"id": "f6b4280685871104",
"id": "06a9a60965e9bdf4",
"type": "leaf",
"state": {
"type": "markdown",
"type": "kanban",
"state": {
"file": "redro.md",
"mode": "source",
"source": false
}
}
},
{
"id": "cae407141cab5a3a",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "user1.md",
"mode": "source",
"source": false
"file": "ROADMAP.md"
}
}
}
Expand Down Expand Up @@ -73,7 +59,7 @@
}
],
"direction": "horizontal",
"width": 199.5
"width": 300
},
"right": {
"id": "936e31e7bd4b902f",
Expand All @@ -89,7 +75,7 @@
"state": {
"type": "backlink",
"state": {
"file": "redro.md",
"file": "ROADMAP.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
Expand All @@ -106,7 +92,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "redro.md",
"file": "ROADMAP.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
Expand All @@ -129,7 +115,7 @@
"state": {
"type": "outline",
"state": {
"file": "redro.md"
"file": "ROADMAP.md"
}
}
}
Expand All @@ -140,17 +126,17 @@
"width": 300,
"collapsed": true
},
"active": "f6b4280685871104",
"active": "06a9a60965e9bdf4",
"lastOpenFiles": [
"user1.md",
"ROADMAP.md",
"redro.md",
"README.md",
"guest-wifi.md",
"burgerking-wifi.md",
"README.md",
"ROADMAP.md",
"user2.md",
"user3.md",
"redro.md.md",
"file.md"
"user2.md",
"file.md",
"curl.md"
]
}
2 changes: 1 addition & 1 deletion main.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function Get-fullName {

# Write Error is just for troubleshooting
catch {Write-Error "No name was detected"
return $env:UserName
return "NA"
-ErrorAction SilentlyContinue
}

Expand Down

0 comments on commit 1f1a98d

Please sign in to comment.