Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict

This commit is contained in:
Enno Rehling 2018-08-05 06:42:31 +02:00
parent b0fb1e5032
commit 2bb3e7601d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clibs

@ -1 +1 @@
Subproject commit d86c8525489d7f11b7ba13e101bb59ecf160b871 Subproject commit 66a891b383f1a51bb0d4e5cf002530f7f70bf7f4

2
src/automate.c
View File

@ -14,7 +14,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
int cmp_scholars(const void *lhs, const void *rhs) static int cmp_scholars(const void *lhs, const void *rhs)
{ {
const scholar *a = (const scholar *)lhs; const scholar *a = (const scholar *)lhs;
const scholar *b = (const scholar *)rhs; const scholar *b = (const scholar *)rhs;