resolved conflicts for merge of f82f5e01 to lmp-mr1-dev.

Change-Id: I093d7ecf48e9137b974047cd7d0fd2209792b748
This commit is contained in:
dcashman 2015-02-06 10:39:23 -08:00
commit 880be46225

View file

@ -40,7 +40,9 @@ int main(int argc, char **argv)
char *policy;
struct policy_file pf;
policydb_t policydb;
int rc, i;
int rc;
int i;
if (argc < 3)
usage(argv[0]);
policy = argv[1];
@ -55,7 +57,5 @@ int main(int argc, char **argv)
}
}
usage(argv[0]);
// will never be called due to exit() call in usage
exit(1);
exit(0);
}