It's the latter. The point is that each x has a neighborhood U whose inverse image consists of homeomorphic "copies" of U in the covering space.
In the definition of covering map is one to take the "disjoint union" of open sets to literally be or is one to assume that the class of open sets is merely pairwise disjoint?