7 lines
79 B
Bash
7 lines
79 B
Bash
|
<<<<<<< HEAD
|
||
|
|
#!/bin/bash
|
||
|
|
=======
|
||
|
|
#!/bin/bash
|
||
|
|
# Do nothing for now.
|
||
|
|
>>>>>>> jan
|