A 20-year-old woman has been arrested and charged following an incident at a Tesco store in Corstorphine,
Emergency services were called to the store in Meadow Place Road just after 4pm on Friday 9 January after concerns were raised for a woman with an alleged weapon.
Numerous police vehicles and officers some of whom were armed were seen at the premises.
The woman has since been released on an undertaking to appear at court at a later date.
A police spokesperson said: “Around 4.10pm on Friday, January 9, we received a report of concern for a person with a weapon at Meadow Place Road, Edinburgh.
“Emergency services attended and a 20-year-old woman was arrested and charged in connection and released on an undertaking to appear at court at a later date.”
