The action, which started on Tuesday, caused delays for thousands of passengers travelling on budget airlines.
EasyJet and Ryanair flights were the worst affected with 750 services axed between Tuesday and yesterday.
Scores of flights by other UK airlines had to be cancelled due to the strike which was scheduled to continue until Sunday.
Fears over the strike's knock-on effect were growing, with this weekend traditionally the busiest for Scottish airports due to the start of the school summer holidays.
But last night, the strike was called off.
It ended following discussions between unions and
the French government, with the authority saying they recognised the "importance
of investment in the sector".
At Prestwick, a flight to Barcelona was cancelled on Tuesday and passengers faced delays of up to two-and-a-half hours yesterday from Glasgow airport.
Initially, nearly all the flights axed were ones not starting or finishing in the UK.
But yesterday a number of UK flights were cancelled and others flying over French airspace were delayed.
EasyJet warned customers to expect some delays even though the industrial action has been called off.
The carrier said: "The strike has been cancelled from this morning so we are expecting a fairly normal operating day today.
"The level of disruption caused over the last two days is likely to have some knock-on effect throughout today, so regrettably we could still see a number of delays while we fully recover, but we are working hard to minimise any impact to our customers."