forget to remove a line after merging
This commit is contained in:
parent
437f0e8cf5
commit
53da8722f8
1 changed files with 1 additions and 2 deletions
3
ccc.c
3
ccc.c
|
@ -265,8 +265,7 @@ int main(int argc, char** argv)
|
|||
}
|
||||
|
||||
/*
|
||||
<<<<<<< HEAD
|
||||
* change directory in window
|
||||
* Change directory in window
|
||||
*/
|
||||
void change_dir(const char *buf)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue