tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix my incorrect merge resolution for 132b7d750e.

Browse source 
The conflict was the actual intended change.

Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
This commit is contained in:
Elliott Hughes 2013-07-11 18:57:39 -07:00
parent 786b1232d2
commit 7b9c33b1e0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr_priv.h
View file

@ -35,7 +35,7 @@ struct fstab_rec {
char *key_loc;
};
#define WAIT_TIMEOUT 5
#define WAIT_TIMEOUT 20
/* fstab has the following format:
*