Skip to content

Commit 7edb7bb

Browse files
authored
challenge 06: Added new markdown file which consists the link of 2 gists and pull request for newly created branch (#107)
* Adding the Aadhirajan.md file * Added the URL of the github issue to Aadhirajan.md Challenge 5 completed * Added new markdown file which consists the link of 2 gists * Intermedite Challenge 1 : Added 2 commits into 1 Adding the Aadhirajan.md file Added the URL of the github issue to Aadhirajan.md Challenge 5 completed * this is a signed commit * Commiting with git signing using gpg key * Intermediate Challenge 05 merge conflict completed This file is created to create merge conflict Append text to primary branch for merge conflict appended content to merge.txt Accidently created a new txt file so deleteing it * Updated python program for linters * Resolving merge conflict * resolving merge conflicts * resolving * resolving merge conflicts * resolving * resolving * resolving * linter error * resolving * linter error
1 parent 940b7d8 commit 7edb7bb

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

contributors/Aadhirajan/Merge.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This is a New text file to create a merge conflict
2+
Appending to text to primary branch of merge conflict
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
gist1:https://gist.github.com/Aadhirajan/fb62c111f00a5e68cf3a45d9eb7be1c3
2+
gist2:https://gist.github.com/Aadhirajan/be6f4d79139571de90e6a2e17ab36943

contributors/Aadhirajan/helloworld.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
print("hello world")

0 commit comments

Comments
 (0)