Skip to content

Commit

Permalink
Merge branch 'master' into my-new-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
fineanmol authored Oct 25, 2021
2 parents 281cf48 + caabaa8 commit fab204a
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Contributors.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
<!-- Add to the bottom of the list -->

<a class="box-item" href="https://github.com/fineanmol"><span>Anmol Agarwal</span></a>
<a class="box-item" href="https://github.com/tushar-bht"><span>Tushar Bhatt</span></a>
<a class="box-item" href="https://github.com/Amitava123"><span>Amitava Mitra</span></a>
<a class="box-item" href="https://github.com/philson-philip"><span>Philson Philip</span></a>
<a class="box-item" href="https://github.com/SHIV1003"><span>Shivam Goyal</span></a>
Expand Down Expand Up @@ -444,7 +445,10 @@
<a class="box-item" href="https://github.com/sunankles"><span>Sunankles</span></a>
<a class="box-item" href="https://github.com/Ibb-uth"><span>Ibraheem Uthman</span></a>
<a class="box-item" href="https://github.com/dennisjonda"><span>Dennis Jonda</span></a>
<a class="box-item" href="https://github.com/volicar"><span>Vinicius Olicar</span></a>
<a class="box-item" href="https://github.com/Aakashmau"><span>Aakash Maurya</span></a>
<a class="box-item" href="https://github.com/volicar"><span>Vinicius Olicar</span></a>


<!-- Please maintain the alignment... -->


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include <iostream>
#include <vector>
using namespace std;

void shift(vector<int>& array);

int main() {
vector<int> arr = {1,0,4,3};
shift(arr);
for (int j = 0; j < arr.size(); j++) {
cout << arr[j] << " ";
}
cout << endl;
}
void shift(vector<int>& array) {
for (int i = array.size() - 2; i >= 1; i--) {
array[i+1] = array[i];
}
array[1] = 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def draw_function(event, x,y,flags,param):
cv2.namedWindow('image')
cv2.setMouseCallback('image',draw_function)

while(1):
while(1): # while loop execution stops when condition is false.

cv2.imshow("image",img)
if (clicked):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Source: https://www.sudipg.com.np/posts/default-argument-rust-using-macro/#-solution

macro_rules! print_this {
($a: expr) => {
print_this_raw($a, 0, 0);
};
($a: expr, $b: expr) => {
print_this_raw($a, $b, 0);
};
($a: expr, $b: expr, $c: expr) => {
print_this_raw($a, $b, $c);
};
}

fn print_this_raw(a: i32, b: i32, c: i32) {
println!("a = {} >> b = {} >> c = {}", a, b, c);
}

fn main() {
// a = 10, b = 0, c = 0
print_this!(10);

// a = 10, b = 20, c = 0
print_this!(10, 20);

// a = 10, b = 20, c = 30
print_this!(10, 20, 30);
}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ This will give you any eventual conflicts and allow you to easily solve them in

For more information on syncing forks [read this article from Github](https://help.github.com/articles/syncing-a-fork/).

## Swags of Hacktoberfest:
- Many of the candidates get attracted towards hacktoberfest to get swags . So, after 4 successfully merged pull request as for 2021 you will be eligible to get a Hacktoberfest T-shirt and Some stickers on your doorstep.

<li><B><p><img src="https://miro.medium.com/max/1050/1*4JctIO7irt8hFxBmTvUpiQ.jpeg" width="400" height="225" style="width: 400px; height: 225px;" alt="tshirt image"></a></p><p><img src="https://miro.medium.com/max/1050/1*jkffr74bq5RsQ_xqDhgqYQ.jpeg" width="400" height="225" style="width: 400px; height: 225px;" alt="stickers image"></p>
</b></li>

# FAQs

Expand Down
3 changes: 2 additions & 1 deletion css/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
height: 25px;
}
.footer-icon {
color: #ff0844;
color: #ff229b;
}
#footer h3 span:hover {
cursor: pointer;
Expand All @@ -23,6 +23,7 @@
.hacktoberfest-image {
display: flex;
justify-content: center;
flex-wrap: wrap;
margin-bottom: 80px;
}
#backToTop {
Expand Down

0 comments on commit fab204a

Please sign in to comment.