An area in the eastern Mediterranean has been disputed, as Turkey has been looking for oil and natural gas in waters that Greece considers to be Greek.
France has now increased its military presence in the area due to rising tensions.
See a summary of the conflict in 60 seconds in the video above.