Commit ed4c390a authored by 李安沛's avatar 李安沛

change i from 0 to 1

parents f1a78a47 89180de7
second file, minrui
Second file. lizilong
second file,minrui
second file. niuleisen
second file , wanglinxin
second file , yaoyulin
econd file zhangjinshuang.c
second file : zhangyan
2nd file zangyunhe
......@@ -3,12 +3,18 @@ int main(){
printf("This is the first line added by the teacher .\n");
// add comment
// Here is a bug I fixed!
<<<<<<< HEAD
int i = 1;
=======
// Here is the added line
int i = 0;
>>>>>>> 89180de7e43a7e2e4fb8092a0dc9b06ccc2c0de7
for(int j =0;j<10;j++){
printf("i=%d\n",i);
i=4*i+2;
}
iiiiiiiidjoa:wq:
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment