@hurshb50/setup-ubuntu 1.5.2 → 1.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,7 +12,7 @@
12
12
  autoSetupRemote = true
13
13
 
14
14
  [merge]
15
- conflictStyle = zdiff3
15
+ conflictStyle = merge
16
16
 
17
17
  [diff]
18
18
  algorithm = histogram
@@ -11,7 +11,7 @@ import util from "util";
11
11
  import childProcess from "child_process";
12
12
  //#region package.json
13
13
  var name = "@hurshb50/setup-ubuntu";
14
- var version = "1.5.1";
14
+ var version = "1.5.2";
15
15
  //#endregion
16
16
  //#region source/modules/logger/logger.ts
17
17
  var Logger = class Logger {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hurshb50/setup-ubuntu",
3
- "version": "1.5.2",
3
+ "version": "1.5.3",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "distribution"