From 00e54876b2661905b735de56ef4a984a90c95a6f Mon Sep 17 00:00:00 2001 From: Tameika Reed Date: Thu, 20 Jul 2017 00:05:36 -0400 Subject: [PATCH 1/5] Adding new file to pwg --- testfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 testfile.txt diff --git a/testfile.txt b/testfile.txt new file mode 100644 index 0000000..b6e5c3f --- /dev/null +++ b/testfile.txt @@ -0,0 +1 @@ +this is a new file for new branch From 74126a8b6c8af37a5e7b3c8e6d26f1b6f077f5f8 Mon Sep 17 00:00:00 2001 From: Tameika Reed Date: Sun, 23 Jul 2017 11:08:41 -0400 Subject: [PATCH 2/5] removed bad text --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 4dfd9e4..fbf8d8b 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,3 @@ just a test hello cloud gurus My name is tam I am Playing with github -"resources": [ - { - "type": "Microsoft.Storage/storageAccounts", - "name": "[variables('storageAccountName')]", - "apiVersion": "[variables('apiVersion')]", - "location": "[variables('location')]", - "properties": { - "accountType": "[parameters('storageAccountType')]" - } - }, - { From 0edefc5ddaf10e121774c584945e0f558f0ad381 Mon Sep 17 00:00:00 2001 From: tnrwil Date: Sun, 23 Jul 2017 11:31:28 -0400 Subject: [PATCH 3/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 76d55d4..5331a9c 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ this is test can you see that just a test hello cloud gurus My name is tam I am +Lets see if this changed From 1c445c9ac05f2d08ed28ce2fb163d496e66ad1bc Mon Sep 17 00:00:00 2001 From: tnrwil Date: Wed, 26 Jul 2017 15:12:55 -0400 Subject: [PATCH 4/5] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 024555d..8c9858b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,3 @@ My name is tam I am <<<<<<< HEAD Playing with github Lets see if this conflict works - -======= -Lets see if this changed ->>>>>>> 0edefc5ddaf10e121774c584945e0f558f0ad381 From 91c78ebc26322e9d2badeab9716fd99f6b0a8242 Mon Sep 17 00:00:00 2001 From: tnrwil Date: Wed, 26 Jul 2017 15:13:21 -0400 Subject: [PATCH 5/5] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8c9858b..d5a03c2 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,5 @@ this is test can you see that just a test hello cloud gurus My name is tam I am -<<<<<<< HEAD Playing with github Lets see if this conflict works